ubiquity

Merge lp:~agateau/ubiquity/kde-fix-broken-sidebar-layout-on-greeter into lp:ubiquity

  1. kde-fix-broken-sidebar-layout-on-greeter
  2. Merge into trunk
Proposed by Aurélien Gâteau
Status: Merged
Merged at revision: 6192
Proposed branch: lp:~agateau/ubiquity/kde-fix-broken-sidebar-layout-on-greeter
Merge into: lp:ubiquity
Diff against target: 102 lines (+22/-17)
4 files modified
gui/qt/app.ui (+14/-11)
gui/qt/breadcrumb_current.qss (+1/-2)
ubiquity/frontend/kde_components/Breadcrumb.py (+6/-2)
ubiquity/frontend/kde_ui.py (+1/-2)
To merge this branch: bzr merge lp:~agateau/ubiquity/kde-fix-broken-sidebar-layout-on-greeter
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+216365@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 'gui/qt/app.ui'
2--- gui/qt/app.ui 2014-04-16 09:52:59 +0000
3+++ gui/qt/app.ui 2014-04-17 16:18:12 +0000
4@@ -184,7 +184,7 @@
5 <item>
6 <widget class="QWidget" name="steps_widget" native="true">
7 <property name="sizePolicy">
8- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
9+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
10 <horstretch>0</horstretch>
11 <verstretch>0</verstretch>
12 </sizepolicy>
13@@ -196,20 +196,23 @@
14 <property name="margin">
15 <number>0</number>
16 </property>
17- <item>
18- <widget class="QWidget" name="steps_filler_widget" native="true">
19- <property name="sizePolicy">
20- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
21- <horstretch>0</horstretch>
22- <verstretch>0</verstretch>
23- </sizepolicy>
24- </property>
25- </widget>
26- </item>
27 </layout>
28 </widget>
29 </item>
30 <item>
31+ <spacer name="verticalSpacer">
32+ <property name="orientation">
33+ <enum>Qt::Vertical</enum>
34+ </property>
35+ <property name="sizeHint" stdset="0">
36+ <size>
37+ <width>40</width>
38+ <height>20</height>
39+ </size>
40+ </property>
41+ </spacer>
42+ </item>
43+ <item>
44 <widget class="QFrame" name="sidebar_footer_frame">
45 <property name="sizePolicy">
46 <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
47
48=== modified file 'gui/qt/breadcrumb_current.qss'
49--- gui/qt/breadcrumb_current.qss 2013-02-28 06:42:46 +0000
50+++ gui/qt/breadcrumb_current.qss 2014-04-17 16:18:12 +0000
51@@ -1,4 +1,4 @@
52-QFrame {
53+QFrame[isBreadcrumb=true] {
54 border-top-width: 10px;
55 border-bottom-width: 10px;
56 background-image: none;
57@@ -7,7 +7,6 @@
58
59 .QLabel {
60 color: #333;
61- border-width: 0px;
62 border-image: none;
63 }
64
65
66=== modified file 'ubiquity/frontend/kde_components/Breadcrumb.py'
67--- ubiquity/frontend/kde_components/Breadcrumb.py 2013-03-07 18:24:39 +0000
68+++ ubiquity/frontend/kde_components/Breadcrumb.py 2014-04-17 16:18:12 +0000
69@@ -30,13 +30,17 @@
70 __all__ = ["Breadcrumb"]
71
72
73-class Breadcrumb(QtGui.QFrame):
74+# HACK! Breadcrumb should not have to inherit from QLabel! Inheriting from
75+# QFrame should be enough, but right now (Trusty) if I change Breadcrumb to
76+# inherit from QFrame then _mainLabel is not given enough vertical space and
77+# its text gets cropped at the bottom.
78+class Breadcrumb(QtGui.QLabel):
79 TODO = 0
80 CURRENT = 1
81 DONE = 2
82
83 def __init__(self, parent=None):
84- QtGui.QFrame.__init__(self, parent)
85+ super(Breadcrumb, self).__init__(parent)
86 self.setProperty("isBreadcrumb", True)
87
88 self._tickLabel = QtGui.QLabel()
89
90=== modified file 'ubiquity/frontend/kde_ui.py'
91--- ubiquity/frontend/kde_ui.py 2014-03-06 06:42:00 +0000
92+++ ubiquity/frontend/kde_ui.py 2014-04-17 16:18:12 +0000
93@@ -315,8 +315,7 @@
94 widget = Breadcrumb()
95 widget.setObjectName(name)
96 layout = self.ui.steps_widget.layout()
97- # "- 1" to insert before the bottom spacer
98- layout.insertWidget(layout.count() - 1, widget)
99+ layout.addWidget(widget)
100 return widget
101
102 def _apply_stylesheet(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: