Merge lp:~agateau/ubiquity/kde-partman-fix-model-updates2 into lp:ubiquity

Proposed by Aurélien Gâteau
Status: Merged
Merged at revision: 6174
Proposed branch: lp:~agateau/ubiquity/kde-partman-fix-model-updates2
Merge into: lp:ubiquity
Diff against target: 25 lines (+5/-0)
1 file modified
ubiquity/frontend/kde_components/PartitionModel.py (+5/-0)
To merge this branch: bzr merge lp:~agateau/ubiquity/kde-partman-fix-model-updates2
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+215849@code.launchpad.net

Description of the change

Fix crashes caused by rows from PartitionModel being removed behind the view back

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 'ubiquity/frontend/kde_components/PartitionModel.py'
2--- ubiquity/frontend/kde_components/PartitionModel.py 2012-11-22 16:27:21 +0000
3+++ ubiquity/frontend/kde_components/PartitionModel.py 2014-04-15 11:47:49 +0000
4@@ -23,6 +23,7 @@
5 self.clear()
6
7 def clear(self):
8+ self.beginResetModel()
9 rootData = []
10 rootData.append(QtCore.QVariant(get_string('partition_column_device')))
11 rootData.append(QtCore.QVariant(get_string('partition_column_type')))
12@@ -32,9 +33,13 @@
13 rootData.append(QtCore.QVariant(get_string('partition_column_size')))
14 rootData.append(QtCore.QVariant(get_string('partition_column_used')))
15 self.rootItem = TreeItem(rootData)
16+ self.endResetModel()
17
18 def append(self, data, ubiquity):
19+ row = self.rowCount(QtCore.QModelIndex())
20+ self.beginInsertRows(QtCore.QModelIndex(), row, row)
21 self.rootItem.appendChild(TreeItem(data, ubiquity, self.rootItem))
22+ self.endInsertRows()
23
24 def columnCount(self, parent):
25 if parent.isValid():

Subscribers

People subscribed via source and target branches

to status/vote changes: