Apport

Merge lp:~ev/apport/whoopsie into lp:~apport-hackers/apport/trunk

  1. whoopsie
  2. Merge into trunk
Proposed by Evan
Status: Merged
Merged at revision: 2233
Proposed branch: lp:~ev/apport/whoopsie
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 62 lines (+16/-4)
2 files modified
gtk/apport-gtk (+8/-2)
kde/apport-kde (+8/-2)
To merge this branch: bzr merge lp:~ev/apport/whoopsie
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+97711@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Very nice, thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/apport-gtk'
2--- gtk/apport-gtk 2012-03-08 16:43:32 +0000
3+++ gtk/apport-gtk 2012-03-15 17:55:33 +0000
4@@ -83,14 +83,19 @@
5 spinner.hide()
6 return spinner
7
8- def ui_update_view(self):
9+ def ui_update_view(self, shown_keys=None):
10+ if shown_keys:
11+ keys = set(self.report.keys()) & set(shown_keys)
12+ else:
13+ keys = self.report.keys()
14 # show the most interesting items on top
15- keys = sorted(self.report)
16+ keys = sorted(keys)
17 for k in ('Traceback', 'StackTrace', 'Title', 'ProblemType', 'Package', 'ExecutablePath'):
18 if k in keys:
19 keys.remove(k)
20 keys.insert(0, k)
21
22+ self.tree_model.clear()
23 for key in keys:
24 keyiter = self.tree_model.insert_before(None, None)
25 self.tree_model.set_value(keyiter, 0, key)
26@@ -472,6 +477,7 @@
27 widget.set_label(_('Hide Details'))
28 if not self.collect_called:
29 self.collect_called = True
30+ self.ui_update_view(['ExecutablePath'])
31 GLib.idle_add(lambda: self.collect_info(on_finished=self.ui_update_view))
32 return True
33
34
35=== modified file 'kde/apport-kde'
36--- kde/apport-kde 2012-03-07 17:20:26 +0000
37+++ kde/apport-kde 2012-03-15 17:55:33 +0000
38@@ -249,6 +249,7 @@
39 def showtree(self, visible):
40 self.treeview.setVisible(visible)
41 if visible and not self.collect_called:
42+ self.ui.ui_update_view(self, ['ExecutablePath'])
43 QTimer.singleShot(0, lambda: self.ui.collect_info(on_finished=self.collect_done))
44 self.collect_called = True
45 if visible:
46@@ -284,10 +285,15 @@
47 # ui_* implementation of abstract UserInterface classes
48 #
49
50- def ui_update_view(self, dialog):
51+ def ui_update_view(self, dialog, shown_keys=None):
52 # report contents
53 details = dialog.findChild(QTreeWidget, 'details')
54- for key in sorted(self.report):
55+ if shown_keys:
56+ keys = set(self.report.keys()) & set(shown_keys)
57+ else:
58+ keys = self.report.keys()
59+ details.clear()
60+ for key in sorted(keys):
61 keyitem = QTreeWidgetItem([key])
62 details.addTopLevelItem(keyitem)
63

Subscribers

People subscribed via source and target branches