CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-04-30 02:52:31 +12:00
Code Issues Projects Releases Wiki Activity

Corrects small things with characters

Browse source
This commit is contained in:
Olivier Keshavjee 2015-06-17 21:17:12 +02:00
parent 4e54a23d13
commit c339e9cae8
3 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mainWindow.py
View file

@ -323,13 +323,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
idx = self.mdlPersosProxy.mapToSource(self.lstPersos.currentIndex()) idx = self.mdlPersosProxy.mapToSource(self.lstPersos.currentIndex())
else: else:
idx = self.lstPersos.currentIndex() idx = self.lstPersos.currentIndex()
px = QPixmap(32, 32)
icon = self.mdlPersos.item(idx.row()).icon() icon = self.mdlPersos.item(idx.row()).icon()
if icon: color = iconColor(icon).name() if icon else ""
px.fill(iconColor(icon)) self.btnPersoColor.setStyleSheet("background:{};".format(color))
self.btnPersoColor.setIcon(QIcon(px))
def resizePersosInfos(self): def resizePersosInfos(self):
self.tblPersoInfos.resizeColumnToContents(0) self.tblPersoInfos.resizeColumnToContents(0)
w = self.tblPersoInfos.viewport().width() w = self.tblPersoInfos.viewport().width()
@ -355,8 +353,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
color = Qt.white color = Qt.white
self.colorDialog = QColorDialog(color, self) self.colorDialog = QColorDialog(color, self)
color = self.colorDialog.getColor(color) color = self.colorDialog.getColor(color)
self.setPersoColor(idx.row(), color) if color.isValid():
self.updatePersoColor() self.setPersoColor(idx.row(), color)
self.updatePersoColor()
def setPersoColor(self, row, color): def setPersoColor(self, row, color):
px = QPixmap(32, 32) px = QPixmap(32, 32)

5
src/models/persosProxyModel.py
View file

@ -63,13 +63,16 @@ class persosProxyModel(QAbstractProxyModel):
def setSourceModel(self, model): def setSourceModel(self, model):
QAbstractProxyModel.setSourceModel(self, model) QAbstractProxyModel.setSourceModel(self, model)
self.sourceModel().dataChanged.connect(self.mapModel) self.sourceModel().dataChanged.connect(self.mapModelMaybe)
self.sourceModel().rowsInserted.connect(self.mapModel) self.sourceModel().rowsInserted.connect(self.mapModel)
self.sourceModel().rowsRemoved.connect(self.mapModel) self.sourceModel().rowsRemoved.connect(self.mapModel)
self.sourceModel().rowsMoved.connect(self.mapModel) self.sourceModel().rowsMoved.connect(self.mapModel)
self.mapModel() self.mapModel()
def mapModelMaybe(self, topLeft, bottomRight):
if topLeft.column() <= Perso.importance.value <= bottomRight.column():
self.mapModel()
def mapModel(self): def mapModel(self):
self.beginResetModel() self.beginResetModel()

18
src/settingsWindow.py
View file

@ -170,10 +170,11 @@ class settingsWindow(QWidget, Ui_Settings):
color = QColor(settings.corkBackground["color"]) color = QColor(settings.corkBackground["color"])
self.colorDialog = QColorDialog(color, self) self.colorDialog = QColorDialog(color, self)
color = self.colorDialog.getColor(color) color = self.colorDialog.getColor(color)
settings.corkBackground["color"] = color.name() if color.isValid():
self.updateCorkColor() settings.corkBackground["color"] = color.name()
# Update Cork view self.updateCorkColor()
self.mw.redacEditor.corkView.updateBackground() # Update Cork view
self.mw.redacEditor.corkView.updateBackground()
def updateCorkColor(self): def updateCorkColor(self):
self.btnCorkColor.setStyleSheet("background:{};".format(settings.corkBackground["color"])) self.btnCorkColor.setStyleSheet("background:{};".format(settings.corkBackground["color"]))
@ -243,7 +244,8 @@ class settingsWindow(QWidget, Ui_Settings):
color = iconColor(self.mw.mdlLabels.item(index.row()).icon()) color = iconColor(self.mw.mdlLabels.item(index.row()).icon())
self.colorDialog = QColorDialog(color, self) self.colorDialog = QColorDialog(color, self)
color = self.colorDialog.getColor(color) color = self.colorDialog.getColor(color)
px = QPixmap(32, 32) if color.isValid():
px.fill(color) px = QPixmap(32, 32)
self.mw.mdlLabels.item(index.row()).setIcon(QIcon(px)) px.fill(color)
self.updateLabelColor(index) self.mw.mdlLabels.item(index.row()).setIcon(QIcon(px))
self.updateLabelColor(index)