Merge lp:~azzar1/software-properties/fix-1817352 into lp:software-properties

Proposed by Andrea Azzarone on 2019-02-25
Status: Merged
Merged at revision: 1076
Proposed branch: lp:~azzar1/software-properties/fix-1817352
Merge into: lp:software-properties
Diff against target: 42 lines (+4/-4)
2 files modified
data/gtkbuilder/main.ui (+1/-1)
softwareproperties/gtk/LivepatchPage.py (+3/-3)
To merge this branch: bzr merge lp:~azzar1/software-properties/fix-1817352
Reviewer Review Type Date Requested Status
Sebastien Bacher 2019-02-25 Approve on 2019-02-25
Review via email: mp+363612@code.launchpad.net

Commit message

LivepatchPage: Make sure the scrolled window of the error message view is always visible

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

That makes sense!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/gtkbuilder/main.ui'
2--- data/gtkbuilder/main.ui 2019-02-18 16:16:13 +0000
3+++ data/gtkbuilder/main.ui 2019-02-25 13:09:08 +0000
4@@ -1203,7 +1203,7 @@
5 <property name="interpolate_size">True</property>
6 <child>
7 <object class="GtkScrolledWindow">
8- <property name="visible">False</property>
9+ <property name="visible">True</property>
10 <property name="can_focus">True</property>
11 <property name="shadow_type">in</property>
12 <child>
13
14=== modified file 'softwareproperties/gtk/LivepatchPage.py'
15--- softwareproperties/gtk/LivepatchPage.py 2019-02-07 19:35:56 +0000
16+++ softwareproperties/gtk/LivepatchPage.py 2019-02-25 13:09:08 +0000
17@@ -173,13 +173,13 @@
18 availability_message = self._lps.props.availability_message
19
20 has_error = (
21- error_message or
22+ error_message is not None or
23 (availability == LivepatchAvailability.FALSE and
24 availability_message is not None))
25
26 if has_error:
27+ self._parent.stack_livepatch.set_visible_child_name('page_livepatch_message')
28 self._parent.stack_livepatch.set_visible(True)
29- self._parent.stack_livepatch.set_visible_child_name('page_livepatch_message')
30 text_buffer = self._parent.textview_livepatch.get_buffer()
31 text_buffer.delete(
32 text_buffer.get_start_iter(), text_buffer.get_end_iter())
33@@ -232,8 +232,8 @@
34 self._trigger_ui_update(skip=True, error_message=_('Failed to retrieve Livepatch status.'))
35 return
36
37+ self._parent.stack_livepatch.set_visible_child_name('page_livepatch_status')
38 self._parent.stack_livepatch.set_visible(True)
39- self._parent.stack_livepatch.set_visible_child_name('page_livepatch_status')
40
41 check_state = status['Status'][0]['Livepatch']['CheckState'] if status else None
42 state = status['Status'][0]['Livepatch']['State'] if status else None

Subscribers

People subscribed via source and target branches

to status/vote changes: