Merge lp:~pali/ubuntu/oneiric/kubuntu-default-settings/kubuntu-default-settings into lp:ubuntu/oneiric/kubuntu-default-settings

[Pali]

plymouth-theme-kubuntu-logo: Added support for scrolling boot log messages in kubuntu-logo theme

This is part of patch series for plymouth. Other patches for ubuntu-logo and plymouth binary here:
https://code.launchpad.net/~pali/ubuntu/natty/plymouth/plymouth/+merge/61897

[Martin Pitt (pitti)]

This is blocked on landing https://code.launchpad.net/~pali/ubuntu/natty/plymouth/plymouth/+merge/61897 upstream first. I'm setting this to "work in progress", please set back to "needs review" once above happened. Thanks!

[lp:~pali/ubuntu/oneiric/kubuntu-default-settings/kubuntu-default-settings]

308. By Pali on 2011-10-30

kubuntu-logo: fix position and count of boot log messages

309. By Pali on 2011-10-30

* bzr merge lp:ubuntu/oneiric/kubuntu-default-settings

310. By Pali on 2012-01-28

* bzr merge lp:ubuntu/kubuntu-default-settings

Unmerged revisions

310. By Pali on 2012-01-28

* bzr merge lp:ubuntu/kubuntu-default-settings

309. By Pali on 2011-10-30

* bzr merge lp:ubuntu/oneiric/kubuntu-default-settings

308. By Pali on 2011-10-30

kubuntu-logo: fix position and count of boot log messages

307. By Pali on 2011-06-03

Added support for scrolling boot log messages in kubuntu-logo theme

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-24 10:41:02 +0000
+++ debian/changelog	2012-01-28 13:59:25 +0000
@@ -1,3 +1,18 @@
+kubuntu-default-settings (1:12.04ubuntu2) precise; urgency=low
+
+  * Remove kgpg pre-set config, requires first run wizard now alas
+    but can not be avoided.  LP: #919460
+
+ -- Jonathan Riddell <[e-mail]>  Fri, 27 Jan 2012 13:47:26 +0000
+
+kubuntu-default-settings (1:12.04ubuntu1) precise; urgency=low
+
+  * Avoid launching akonadi at startup. (LP: #873396)
+    - Disable the krunner plugins "Calendar Events" and "Contacts".
+    - Don't display events in the clock widget pop-up.
+
+ -- Felix Geyer <[e-mail]>  Sun, 13 Nov 2011 17:55:10 +0100
+
 kubuntu-default-settings (1:11.10ubuntu4) oneiric; urgency=low
 
   [ Harald Sitter ]

=== modified file 'lib/plymouth/themes/kubuntu-logo/kubuntu-logo.script'
--- lib/plymouth/themes/kubuntu-logo/kubuntu-logo.script	2010-06-17 20:12:03 +0000
+++ lib/plymouth/themes/kubuntu-logo/kubuntu-logo.script	2012-01-28 13:59:25 +0000
@@ -18,6 +18,7 @@
 #  02111-1307, USA.
 # 
 #  Written by: Alberto Milone <[e-mail]>
+#              Pali Rohár <[e-mail]>
 #
 #  Based on the example provided with the "script plugin" written by:
 #              Charlie Brej   <[e-mail]>
@@ -87,7 +88,7 @@
     local.min_height;
 
     # Put the 1st line below the logo + some spacing 
-    y = logo.y + logo.height + (progress_indicator.bullet_height * 7 ); # + logo_spacing;
+    y = logo.y + logo.height + (progress_indicator.bullet_height * 2 ); # + logo_spacing;
 
     text_height = first_line_height * 7.5;
 
@@ -225,6 +226,14 @@
 # a bit if needed.
 top_of_the_text = TextYOffset();
 
+# Character 'M' is the biggest - calculate maximum characters for line
+log_line_width = Window.GetWidth () / ImageToTintedText ("M").GetWidth () - 5;
+# Calculate line count
+log_line_count = ( Window.GetHeight () - progress_indicator.y - progress_indicator.height ) / 20;
+
+for (i = 0; i < log_line_count; i++)
+    log_notification[i] = "";
+
 #-----------------------------------------Logo functions------------------------------
 
 # Call this when updating the screen
@@ -387,10 +396,8 @@
     message_label.y = top_of_the_text;
 
     # Put the 2nd line below the fsck line
-    if (is_action_line) {
-        local.fsck_label.y = message_label.y + (first_line_height + first_line_height / 2);
-        message_label.y = local.fsck_label.y + (first_line_height * 2);
-    }
+    if (is_action_line)
+        message_label.y = progress_indicator.y + progress_indicator.height + 60;
 
     # Debug("action label x = " + message_label.x + " y = " + message_label.y );
 
@@ -487,6 +494,46 @@
     if (keys != NULL)
         message = StringCopy (message, keys + StringLength(local.substring), NULL);
 
+    local.substring = "log:";
+    local.log = StringString (message, local.substring);
+    if (log != NULL) {
+        message = StringCopy (message, log + StringLength (local.substring), NULL);
+
+        if (message == "ok" || message == "failed") {
+            local.last = 0;
+            for (last = 0; last < log_line_count-1; last++) {}
+
+            local.len = StringLength (log_notification[last]);
+            local.ok = "";
+            local.failed = "";
+
+            if (len > 2)
+                ok = StringCopy (log_notification[last], len - 2, NULL);
+
+            if (len > 6)
+                failed = StringCopy (log_notification[last], len - 6, NULL);
+
+            if (len > 0 && ok != "ok" && failed != "failed")
+                log_notification[last] += "   " + message;
+        } else {
+            if (StringLength (message) > log_line_width-6)
+                message = message.SubString (0, log_line_width-9);
+            message += "...";
+
+            for (i = 0; i < log_line_count-1; i++)
+                log_notification[i] = log_notification[i+1];
+            log_notification[i] = message;
+        }
+
+        message = "";
+        for (i = 0; i < log_line_count; i++)
+            if (log_notification[i] != "")
+                message += log_notification[i] + "\n";
+
+        label = get_message_label ("", 1, 1);
+        setup_message ("", label.x, label.y, 10000, 1);
+    }
+
     local.label.is_fake = is_fake;
     label = get_message_label(message, is_fake, is_action_line);
     label.z = 10000;

=== modified file 'share/apps/plasma-desktop/init/00-defaultLayout.js'
--- share/apps/plasma-desktop/init/00-defaultLayout.js	2011-08-19 16:46:29 +0000
+++ share/apps/plasma-desktop/init/00-defaultLayout.js	2012-01-28 13:59:25 +0000
@@ -31,3 +31,4 @@
 
 clock = panel.addWidget("digital-clock");
 clock.writeConfig("showDate", "true");
+clock.writeConfig("displayEvents", "false");

=== modified file 'share/config/kgpgrc'
--- share/config/kgpgrc	2009-09-10 23:27:22 +0000
+++ share/config/kgpgrc	2012-01-28 13:59:25 +0000
@@ -1,12 +1,2 @@
-[General Options]
-First run=false
-
-[GPG Settings]
-Groups=
-gpg_config_path=$HOME/.gnupg/options
-
-[Servers]
-Server_List=hkp://keyserver.ubuntu.com (Default),hkp://wwwkeys.eu.pgp.net,hkp://search.keyserver.net,hkp://wweys.pgp.net,hkp://pgp.dtype.org,hkp://wwwkeys.us.pgp.net
-
 [TipOfDay]
 RunOnStart=false

=== added file 'share/config/krunnerrc'
--- share/config/krunnerrc	1970-01-01 00:00:00 +0000
+++ share/config/krunnerrc	2012-01-28 13:59:25 +0000
@@ -0,0 +1,3 @@
+[Plugins]
+kabccontactsEnabled=false
+org.kde.events_runnerEnabled=false