ubiquity-neon

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

  1. icantwritetotrunk
  2. Merge into trunk
Proposed by Harald Sitter
Status: Merged
Approved by: Jonathan Riddell
Approved revision: 6389
Merge reported by: Harald Sitter
Merged at revision: not available
Proposed branch: lp:~apachelogger/ubiquity-neon/icantwritetotrunk
Merge into: lp:~jr/ubiquity-neon/trunk
Diff against target: 43 lines (+3/-2)
3 files modified
finish-install.d/01oem-config-udeb (+1/-1)
gui/qt/breadcrumb_current.qss (+0/-1)
ubiquity/frontend/kde_ui.py (+2/-0)
To merge this branch: bzr merge lp:~apachelogger/ubiquity-neon/icantwritetotrunk
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+313754@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'finish-install.d/01oem-config-udeb'
2--- finish-install.d/01oem-config-udeb 2013-03-21 16:36:06 +0000
3+++ finish-install.d/01oem-config-udeb 2016-12-22 11:17:12 +0000
4@@ -9,7 +9,7 @@
5 apt-install "oem-config-slideshow-ubuntu" || true
6 fi
7 if [ "$RET" = kde ]; then
8- apt-install "ubiquity-slideshow-kubuntu" || true
9+ apt-install "ubiquity-slideshow-neon" || true
10 fi
11 # Restore title, since packages with debconf templates may have changed it.
12 db_settitle debian-installer/finish-install/title
13
14=== modified file 'gui/qt/breadcrumb_current.qss'
15--- gui/qt/breadcrumb_current.qss 2014-04-17 16:13:47 +0000
16+++ gui/qt/breadcrumb_current.qss 2016-12-22 11:17:12 +0000
17@@ -6,7 +6,6 @@
18 }
19
20 .QLabel {
21- color: #333;
22 border-image: none;
23 }
24
25
26=== modified file 'gui/qt/images/breadcrumb_ltr.png'
27Binary 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
28=== modified file 'gui/qt/images/breadcrumb_rtl.png'
29Binary 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
30=== modified file 'gui/qt/images/sidebar.png'
31Binary 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
32=== modified file 'ubiquity/frontend/kde_ui.py'
33--- ubiquity/frontend/kde_ui.py 2016-05-29 11:15:35 +0000
34+++ ubiquity/frontend/kde_ui.py 2016-12-22 11:17:12 +0000
35@@ -334,6 +334,8 @@
36 # TODO cjwatson 2010-04-07: provide alternative strings instead
37 self.ui.install_process_label.hide()
38 self.breadcrumb_install.hide()
39+ # hide entire header section for neon. we change the sidebar a bit.
40+ self.ui.sidebar_header_frame.hide()
41
42 self.update_back_button()
43 self.update_next_button(install_now=False)

Subscribers

People subscribed via source and target branches