store editor ordering in deck, not config

This commit is contained in:
Damien Elmes 2009-04-07 11:55:33 +09:00
parent 56472da83f
commit 1e22d8b7c5

View file

@ -150,7 +150,7 @@ class DeckModel(QAbstractTableModel):
" order by cards.ordinal, %s") % (fields, order) " order by cards.ordinal, %s") % (fields, order)
# run the query # run the query
self.cards = self.deck.s.all(query) self.cards = self.deck.s.all(query)
if self.parent.config['editorReverseOrder']: if self.deck.getInt('reverseOrder'):
self.cards.reverse() self.cards.reverse()
self.reset() self.reset()
@ -292,7 +292,7 @@ class EditDeck(QMainWindow):
self.dialog.tableView.setFont(QFont( self.dialog.tableView.setFont(QFont(
self.config['editFontFamily'], self.config['editFontFamily'],
self.config['editFontSize'])) self.config['editFontSize']))
if self.parent.config['editorReverseOrder']: if self.deck.getInt("reverseOrder"):
self.dialog.actionReverseOrder.setChecked(True) self.dialog.actionReverseOrder.setChecked(True)
self.setupMenus() self.setupMenus()
self.setupFilter() self.setupFilter()
@ -331,7 +331,7 @@ class EditDeck(QMainWindow):
def setupSort(self): def setupSort(self):
self.dialog.sortBox.setMaxVisibleItems(30) self.dialog.sortBox.setMaxVisibleItems(30)
self.sortIndex = self.config['sortIndex'] self.sortIndex = self.deck.getInt("sortIndex") or 0
self.drawSort() self.drawSort()
self.connect(self.dialog.sortBox, SIGNAL("activated(int)"), self.connect(self.dialog.sortBox, SIGNAL("activated(int)"),
self.sortChanged) self.sortChanged)
@ -388,8 +388,7 @@ class EditDeck(QMainWindow):
self.sortKey = ("field", self.sortFields[idx-8]) self.sortKey = ("field", self.sortFields[idx-8])
self.rebuildSortIndex(self.sortKey) self.rebuildSortIndex(self.sortKey)
self.sortIndex = idx self.sortIndex = idx
if idx <= 7: self.deck.setVar('sortIndex', idx)
self.config['sortIndex'] = idx
self.model.sortKey = self.sortKey self.model.sortKey = self.sortKey
self.model.updateHeader() self.model.updateHeader()
if refresh: if refresh:
@ -795,11 +794,7 @@ where id in %s""" % ids2str(sf))
sm.select(items, QItemSelectionModel.Deselect | QItemSelectionModel.Rows) sm.select(items, QItemSelectionModel.Deselect | QItemSelectionModel.Rows)
def reverseOrder(self): def reverseOrder(self):
if self.parent.config['editorReverseOrder']: self.deck.setVar("reverseOrder", not self.deck.getInt("reverseOrder"))
self.parent.config['editorReverseOrder'] = False;
else:
self.parent.config['editorReverseOrder'] = True;
self.model.cards.reverse() self.model.cards.reverse()
self.model.reset() self.model.reset()
self.focusCurrentCard() self.focusCurrentCard()