Merge lp:~apachelogger/ubiquity-neon/icantwritetotrunk into lp:~jr/ubiquity-neon/trunk

[Harald Sitter]

=== modified file 'finish-install.d/01oem-config-udeb'
--- finish-install.d/01oem-config-udeb	2013-03-21 16:36:06 +0000
+++ finish-install.d/01oem-config-udeb	2016-12-22 11:17:12 +0000
@@ -9,7 +9,7 @@
 	apt-install "oem-config-slideshow-ubuntu" || true
 fi
 if [ "$RET" = kde ]; then
-	apt-install "ubiquity-slideshow-kubuntu" || true
+	apt-install "ubiquity-slideshow-neon" || true
 fi
 # Restore title, since packages with debconf templates may have changed it.
 db_settitle debian-installer/finish-install/title
 
=== modified file 'gui/qt/breadcrumb_current.qss'
--- gui/qt/breadcrumb_current.qss	2014-04-17 16:13:47 +0000
+++ gui/qt/breadcrumb_current.qss	2016-12-22 11:17:12 +0000
@@ -6,7 +6,6 @@
 }
 
 .QLabel {
-    color: #333;
     border-image: none;
 }
 
 
=== modified file 'gui/qt/images/breadcrumb_ltr.png'
 Binary files gui/qt/images/breadcrumb_ltr.png	2015-09-08 13:48:54 +0000 and gui/qt/images/breadcrumb_ltr.png	2016-12-22 11:17:12 +0000 differ
=== modified file 'gui/qt/images/breadcrumb_rtl.png'
 Binary files gui/qt/images/breadcrumb_rtl.png	2015-09-08 13:48:54 +0000 and gui/qt/images/breadcrumb_rtl.png	2016-12-22 11:17:12 +0000 differ
=== modified file 'gui/qt/images/sidebar.png'
 Binary files gui/qt/images/sidebar.png	2015-09-08 13:48:54 +0000 and gui/qt/images/sidebar.png	2016-12-22 11:17:12 +0000 differ
=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2016-05-29 11:15:35 +0000
+++ ubiquity/frontend/kde_ui.py	2016-12-22 11:17:12 +0000
@@ -334,6 +334,8 @@
             # TODO cjwatson 2010-04-07: provide alternative strings instead
             self.ui.install_process_label.hide()
             self.breadcrumb_install.hide()
+            # hide entire header section for neon. we change the sidebar a bit.
+            self.ui.sidebar_header_frame.hide()
 
         self.update_back_button()
         self.update_next_button(install_now=False)