Pass Document to GlyphDBEdit.

This commit is contained in:
Andrey Golovizin 2014-09-19 23:16:34 +02:00
parent 76ca41dda1
commit 8cec21191f
2 changed files with 7 additions and 5 deletions

View file

@ -112,9 +112,10 @@ class GlyphDBModel(QAbstractTableModel):
DateColumn('Date added', 'date_added'), DateColumn('Date added', 'date_added'),
] ]
def __init__(self, glyphdb, parent=None): def __init__(self, document, parent=None):
super().__init__(parent) super().__init__(parent)
self.glyphdb = glyphdb self.document = document
self.glyphdb = document.glyphdb
self.sortColumn = len(self.COLUMNS) - 1 # date_add ed self.sortColumn = len(self.COLUMNS) - 1 # date_add ed
self.sortOrder = Qt.DescendingOrder self.sortOrder = Qt.DescendingOrder
self.values = list(self.glyphdb.values()) self.values = list(self.glyphdb.values())
@ -188,9 +189,10 @@ class GlyphTableView(QTableView):
class GlyphDBEdit(GlyphTableView): class GlyphDBEdit(GlyphTableView):
def __init__(self, glyphdb, *args, **kwargs): def __init__(self, document, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
model = GlyphDBModel(glyphdb, parent=self) self.document = document
model = GlyphDBModel(document, parent=self)
self.horizontalHeader().setSortIndicator(model.sortColumn, model.sortOrder) self.horizontalHeader().setSortIndicator(model.sortColumn, model.sortOrder)
self.setModel(model) self.setModel(model)
self.resizeColumnsToContents() self.resizeColumnsToContents()

View file

@ -55,7 +55,7 @@ class MainWindow(QMainWindow):
self.page = PageView(self.pageScene, centralWidget) self.page = PageView(self.pageScene, centralWidget)
self.glyphEdit = GlyphEdit(centralWidget, document) self.glyphEdit = GlyphEdit(centralWidget, document)
self.glyphEdit.setEnabled(False) self.glyphEdit.setEnabled(False)
self.glyphDBEdit = GlyphDBEdit(self.document.glyphdb) self.glyphDBEdit = GlyphDBEdit(self.document)
self.glyphEdit.glyphEntered.connect(self.unknownGlyphEntered) self.glyphEdit.glyphEntered.connect(self.unknownGlyphEntered)
self.glyphEdit.glyphEntered.connect(self.pageScene.clearHighlight) self.glyphEdit.glyphEntered.connect(self.pageScene.clearHighlight)