Software Properties

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

  1. fix-1817352
  2. Merge into main
Proposed by Andrea Azzarone
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 Approve
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.
Revision history for this message
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
=== modified file 'data/gtkbuilder/main.ui'
--- data/gtkbuilder/main.ui 2019-02-18 16:16:13 +0000
+++ data/gtkbuilder/main.ui 2019-02-25 13:09:08 +0000
@@ -1203,7 +1203,7 @@
1203 <property name="interpolate_size">True</property>1203 <property name="interpolate_size">True</property>
1204 <child>1204 <child>
1205 <object class="GtkScrolledWindow">1205 <object class="GtkScrolledWindow">
1206 <property name="visible">False</property>1206 <property name="visible">True</property>
1207 <property name="can_focus">True</property>1207 <property name="can_focus">True</property>
1208 <property name="shadow_type">in</property>1208 <property name="shadow_type">in</property>
1209 <child>1209 <child>
12101210
=== modified file 'softwareproperties/gtk/LivepatchPage.py'
--- softwareproperties/gtk/LivepatchPage.py 2019-02-07 19:35:56 +0000
+++ softwareproperties/gtk/LivepatchPage.py 2019-02-25 13:09:08 +0000
@@ -173,13 +173,13 @@
173 availability_message = self._lps.props.availability_message173 availability_message = self._lps.props.availability_message
174174
175 has_error = (175 has_error = (
176 error_message or176 error_message is not None or
177 (availability == LivepatchAvailability.FALSE and177 (availability == LivepatchAvailability.FALSE and
178 availability_message is not None))178 availability_message is not None))
179179
180 if has_error:180 if has_error:
181 self._parent.stack_livepatch.set_visible_child_name('page_livepatch_message')
181 self._parent.stack_livepatch.set_visible(True)182 self._parent.stack_livepatch.set_visible(True)
182 self._parent.stack_livepatch.set_visible_child_name('page_livepatch_message')
183 text_buffer = self._parent.textview_livepatch.get_buffer()183 text_buffer = self._parent.textview_livepatch.get_buffer()
184 text_buffer.delete(184 text_buffer.delete(
185 text_buffer.get_start_iter(), text_buffer.get_end_iter())185 text_buffer.get_start_iter(), text_buffer.get_end_iter())
@@ -232,8 +232,8 @@
232 self._trigger_ui_update(skip=True, error_message=_('Failed to retrieve Livepatch status.'))232 self._trigger_ui_update(skip=True, error_message=_('Failed to retrieve Livepatch status.'))
233 return233 return
234234
235 self._parent.stack_livepatch.set_visible_child_name('page_livepatch_status')
235 self._parent.stack_livepatch.set_visible(True)236 self._parent.stack_livepatch.set_visible(True)
236 self._parent.stack_livepatch.set_visible_child_name('page_livepatch_status')
237237
238 check_state = status['Status'][0]['Livepatch']['CheckState'] if status else None238 check_state = status['Status'][0]['Livepatch']['CheckState'] if status else None
239 state = status['Status'][0]['Livepatch']['State'] if status else None239 state = status['Status'][0]['Livepatch']['State'] if status else None

Subscribers

People subscribed via source and target branches

to status/vote changes: