Simplify clear group
Always enforce to send removed The signal cleared is useless if removed is sent
This commit is contained in:
1 parent
bb0053963a
commit
fec4dc1367
2 files changed
+5
-12
No files matched your search
@@ -100,18 +100,15 @@ class Group(SignalEvent, list):
|
||||
self.__getitem__(idx + 1)
|
||||
else:
|
||||
self.__getitem__(idx - 1).next[id(self)] = None
|
||||
if not self.lock_signal:
|
||||
self.signal('group-list-changed', ('record-removed', record))
|
||||
self.signal('group-list-changed', ('record-removed', record))
|
||||
super(Group, self).remove(record)
|
||||
del self.__id2record[record.id]
|
||||
|
||||
def clear(self):
|
||||
if not self.lock_signal:
|
||||
for record in self[:]:
|
||||
self.signal('group-list-changed', ('record-removed', record))
|
||||
self.pop(0).destroy()
|
||||
if not self.lock_signal:
|
||||
self.signal('group-list-changed', ('group-cleared',))
|
||||
for record in self[:]:
|
||||
self.signal('group-list-changed', ('record-removed', record))
|
||||
record.destroy()
|
||||
self.pop(0)
|
||||
self.__id2record = {}
|
||||
self.record_removed, self.record_deleted = [], []
|
||||
|
||||
@@ -398,7 +395,6 @@ class Group(SignalEvent, list):
|
||||
del self.__id2record[old_id]
|
||||
|
||||
def destroy(self):
|
||||
self.lock_signal = True
|
||||
self.clear()
|
||||
super(Group, self).destroy()
|
||||
self.parent = None
|
||||
|
||||
@@ -632,9 +632,6 @@ class ViewList(ParserView):
|
||||
self.store.added(group, signal[1])
|
||||
elif signal[0] == 'record-removed':
|
||||
self.store.removed(group, signal[1])
|
||||
elif signal[0] == 'group-cleared':
|
||||
self.store = None
|
||||
self.widget_tree.set_model(self.store)
|
||||
self.display()
|
||||
|
||||
def cancel(self):
|
||||
|
||||
Reference in new issue
Block a user