Merge lp:~ecanuto/ubuntu/quantal/ubuntu-gnome-default-settings/lp1060123 into lp:ubuntu/quantal/ubuntu-gnome-default-settings

[Everaldo Canuto]

* Some plymouth theme cleanups.
* Fixed password prompt and display messages (LP: #1060123).

[Jeremy Bícha (jbicha)]

Thank you!

review: Approve

=== added file 'lib/plymouth/themes/ubuntu-gnome-logo/progress_dot_off.png'
Binary files lib/plymouth/themes/ubuntu-gnome-logo/progress_dot_off.png	1970-01-01 00:00:00 +0000 and lib/plymouth/themes/ubuntu-gnome-logo/progress_dot_off.png	2012-10-03 14:29:24 +0000 differ
=== modified file 'lib/plymouth/themes/ubuntu-gnome-logo/ubuntu-gnome-logo.script'
--- lib/plymouth/themes/ubuntu-gnome-logo/ubuntu-gnome-logo.script	2012-09-29 00:33:02 +0000
+++ lib/plymouth/themes/ubuntu-gnome-logo/ubuntu-gnome-logo.script	2012-10-03 14:29:24 +0000
@@ -28,10 +28,10 @@
 text_colour.green = 1.0;
 text_colour.blue = 1.0;
 
-# Tinted text #988592
-tinted_text_colour.red = 0.59;
-tinted_text_colour.green = 0.52;
-tinted_text_colour.blue = 0.57;
+# Tinted text #e1e1e1
+tinted_text_colour.red = 0.87;
+tinted_text_colour.green = 0.87;
+tinted_text_colour.blue = 0.87;
 
 # Action Text - #ffffff - RGB 255 255 255
 action_text_colour.red = 1.0;
@@ -86,8 +86,8 @@
     local.text_height;
     local.min_height;
 
-    # Put the 1st line below the logo + some spacing 
-    y = logo.y + logo.height + (progress_indicator.bullet_height * 7 ); # + logo_spacing;
+    # Put the 1st line below the middle screen + some spacing 
+    y = (Window.GetY () + Window.GetHeight () / 2) + 100;
 
     text_height = first_line_height * 7.5;
 
@@ -95,8 +95,6 @@
     if (y + text_height > min_height)
         y = min_height - text_height;
 
-    if (y < progress_indicator.y + progress_indicator.height)
-        return progress_indicator.y + progress_indicator.height;
     return y;
 }
 
@@ -159,8 +157,10 @@
 
 #-----------------------------------------------------------------------------
 # Background colour
-# #2e3436 --> 0.25, 0.30, 0.41
+# #133773 --> 0.07, 0.21, 0.44
 #
+Window.SetBackgroundTopColor (0.07, 0.21, 0.44);
+Window.SetBackgroundBottomColor (0.07, 0.21, 0.44);
 
 # Load the Backgrounds
 screen_width = Window.GetWidth();
@@ -181,9 +181,8 @@
     if ((progress - global.fade_progress) >= (3.0*speed)) {
         global.fade_progress = progress;
     }
-#    DebugBottom("progress: " + progress + " " + (progress - global.fade_progress));
+    #DebugBottom("progress: " + progress + " " + (progress - global.fade_progress));
 
-	
 	tmp_progress = (progress - global.fade_progress)/speed;
 	if (tmp_progress <= 1.0) {      
 	    bg_sprites[1].SetOpacity((1-tmp_progress));
@@ -202,34 +201,8 @@
         }
 }
 
-bits_per_pixel = Window.GetBitsPerPixel ();
-if (bits_per_pixel == 4) {
-    logo_filename = "ubuntu_logo16.png";
-    progress_dot_off_filename = "progress_dot_off16.png";
-    progress_dot_on_filename = "progress_dot_on16.png";
-    password_field_filename = "password_field16.png";
-} else {
-    logo_filename = "ubuntu_logo.png";
-    progress_dot_off_filename = "progress_dot_off.png";
-    progress_dot_on_filename = "progress_dot_on.png";
-    password_field_filename = "password_field.png";
-}
-
-logo.image = Image (logo_filename);
-logo.sprite = Sprite ();
-#logo.sprite.SetImage (logo.image);
-logo.width = logo.image.GetWidth ();
-logo.height = logo.image.GetHeight ();
-logo.x = Window.GetX () + Window.GetWidth () / 2 - logo.width  / 2;
-logo.y = Window.GetY () + Window.GetHeight () / 2 - logo.height;
-logo.z = 1000;
-logo.sprite.SetX (logo.x);
-logo.sprite.SetY (logo.y);
-logo.sprite.SetZ (logo.z);
-logo.sprite.SetOpacity (1);
-
-# Spacing below the logo - in pixels
-logo_spacing = logo.height * 4;
+progress_dot_off_filename = "progress_dot_off.png";
+password_field_filename = "password_field.png";
 
 message_notification[0].image = ImageToTintedText ("");
 message_notification[1].image = ImageToTintedText ("");
@@ -237,16 +210,6 @@
 
 status = "normal";
 
-progress_indicator.bullet_off = Image (progress_dot_off_filename);
-progress_indicator.bullet_on = Image (progress_dot_on_filename);
-progress_indicator.bullet_width = progress_indicator.bullet_off.GetWidth ();
-progress_indicator.bullet_height = progress_indicator.bullet_off.GetHeight ();
-progress_indicator.bullet_hspacing = progress_indicator.bullet_width * 1.1;
-progress_indicator.width = progress_indicator.bullet_width * 5;
-progress_indicator.height = progress_indicator.bullet_height;
-progress_indicator.y = logo.y + logo.height + (logo.height / 4);
-progress_indicator.x = Window.GetX () + Window.GetWidth () / 2 - progress_indicator.width / 2; # logo.x + 26;
-
 # use a fixed string with ascending and descending stems to calibrate the
 # bounding box for the first message, so the messages below don't move up
 # and down according to *their* height.
@@ -257,91 +220,10 @@
 # a bit if needed.
 top_of_the_text = TextYOffset();
 
-#-----------------------------------------Logo functions------------------------------
-
-# Call this when updating the screen
-fun draw_logo () {
-    logo.sprite.SetX (logo.x);
-    logo.sprite.SetY (logo.y);
-    logo.sprite.SetZ (logo.z);
-    logo.sprite.SetOpacity (1);
-}
 
 
 #-----------------------------------------Progress Indicator--------------------------
-fun set_progress_indicator () {
-    
-    
-    # Here we assume that we can store half bullets on each half of the screen
-    # together with some spacing
-    local.x = progress_indicator.x;
-    
-    for (index = 0; index <= 4; index++) {
-        # Set the "off" bullets
-        #progress_indicator.bullets_off[index].sprite = Sprite (progress_indicator.bullet_off);
-        progress_indicator.bullets_off[index].sprite.SetPosition (local.x, progress_indicator.y, 1000);
-        progress_indicator.bullets_off[index].x = local.x;
-        progress_indicator.bullets_off[index].y = progress_indicator.y;
-        progress_indicator.bullets_off[index].sprite.SetOpacity (1);
-        
-        #local.debug_medium_string = "Progress indicator " + index + ": x = " + progress_indicator.bullets_off[index].x +
-        #                  ", y = " + progress_indicator.bullets_off[index].y  + ", logo width = " + logo.width +
-        #                  ", logo height = " + logo.height + " " + screen_width + " " + screen_height;
-        #   
-        #(index % 2) && DebugMedium (local.debug_medium_string) || DebugBottom (local.debug_medium_string);
-
-        # Set the "on" bullets on top of the "off" bullets and make them transparent
-        #progress_indicator.bullets_on[index].sprite = Sprite (progress_indicator.bullet_on);
-        progress_indicator.bullets_on[index].x = progress_indicator.bullets_off[index].x;
-        progress_indicator.bullets_on[index].y = progress_indicator.bullets_off[index].y;
-        progress_indicator.bullets_on[index].sprite.SetPosition (progress_indicator.bullets_on[index].x, progress_indicator.bullets_on[index].y, 10000);
-        progress_indicator.bullets_on[index].sprite.SetOpacity (0);
-        
-        local.x += progress_indicator.bullet_hspacing;
-    }
-    #local.debug_string = "Progress indicator: x1 = " + progress_indicator.x + ", x2 = " + local.x + ", y = " + progress_indicator.y +
-    #                      ", x logo = " + logo.x + ", y logo = " + logo.y + ", indicator width = " + progress_indicator.width;
-    #Debug(progress_indicator.bullets_off[0].x);
-}
-
-
-# We have 2 bullets, one on top of the other:
-# The white one is on top of the red one and the former should
-# slowly fade so as to get a nice transition effect.
-fun switch_on_bullet (bullets_off, bullets_on, bullet_number, opacity) {
-    local.x = bullets_on[bullet_number].x;
-    local.y = bullets_on[bullet_number].y;
-    local.z = bullets_on[bullet_number].z;
-    
-    # Hide the bullets which are off
-    bullets_off[bullet_number].sprite.SetOpacity (0);
-    
-    # Show the bullets which are on
-    bullets_on[bullet_number].sprite.SetPosition (local.x, local.y, local.z);
-    bullets_on[bullet_number].sprite.SetOpacity (opacity);
-    
-    # Bump the number of times we have switched on bullets
-    global.times_bullets_switched++;
-}
-
-fun switch_off_bullets () {
-    # Debug("Switching off progress indicator");
-    
-    set_progress_indicator ();
-    global.times_bullets_switched = 0;
-    global.on_off = 1;
-}
-
-# This is something that we can call when we exit
-fun switch_on_bullets () {
-    # Debug("Switching off progress indicator");
-    if (!global.progress_indicator.bullets_on) set_progress_indicator ();
-    local = global.progress_indicator;
-
-    for (index = 0; bullets_on[index]; index++) {
-        switch_on_bullet (bullets_off, bullets_on, index, 1.0);
-    }
-}
+
 
 
 # Implement in boot progress callback
@@ -354,50 +236,6 @@
         global.update_counter = 0;
         animate_bg(progress);
     }
-
-    if (global.progress_time == NULL) {
-        global.progress_time = progress;  #time;
-        switch_off_bullets ();
-    }
-
-#    Debug ("progress = " + progress + ", time = " + time + " times switched = " + global.times_bullets_switched + " on_off " + global.on_off);
-
-#    if (global.times_bullets_switched == NULL)
-#        global.times_bullets_switched = 5;
-
-#    if (global.on_off == NULL)
-#        global.on_off = 0;
-
-    if ((progress - global.progress_time) >= 1.0) {
-        global.progress_time = progress;
-        
-        if (global.times_bullets_switched == 5) {
-            # Change which bullets are switched on
-            # and which ones are switched off
-            global.on_off = !global.on_off;
-            global.times_bullets_switched = 0;
-        }
-        
-        if (global.on_off) {
-            switch_on_bullet (progress_indicator.bullets_off, progress_indicator.bullets_on,
-                              global.times_bullets_switched, 1.0);
-        }
-        else {
-            switch_on_bullet (progress_indicator.bullets_on, progress_indicator.bullets_off,
-                              global.times_bullets_switched, 1.0);
-        }
-    }
-    
-    
-    # Start setting bullets to "on" with translucency
-#    for (index = 0; index <= 5; index++) {
-#        opacity = 0.0;
-#        while (opacity <= 1.0) {
-#            switch_on_bullet (progress_indicator.bullets_off, progress_indicator.bullets_on,
-#                              index, opacity);
-#            opacity += 0.1;
-#        }
-#    }
 }
 
 
@@ -1063,7 +901,7 @@
 #
 fun refresh_callback ()
 {
-    draw_logo ();
+    # nothing to do
 }
 Plymouth.SetRefreshFunction (refresh_callback);
 
@@ -1092,10 +930,9 @@
 #----------------------------------------- Quit --------------------------------
 
 # TODO: Maybe we should also hide any other dialog
-# Show the logo and make the progress indicator look full when on exit
+# Make the progress indicator look full when on exit
 fun quit_callback ()
 {
-    logo.sprite.SetOpacity (1);
     switch_on_bullets (); 
 }