Corrects small things with characters

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

View File

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

View File

@ -63,13 +63,16 @@ class persosProxyModel(QAbstractProxyModel):
def 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().rowsRemoved.connect(self.mapModel)
self.sourceModel().rowsMoved.connect(self.mapModel)
self.mapModel()
def mapModelMaybe(self, topLeft, bottomRight):
if topLeft.column() <= Perso.importance.value <= bottomRight.column():
self.mapModel()
def mapModel(self):
self.beginResetModel()

View File

@ -170,10 +170,11 @@ class settingsWindow(QWidget, Ui_Settings):
color = QColor(settings.corkBackground["color"])
self.colorDialog = QColorDialog(color, self)
color = self.colorDialog.getColor(color)
settings.corkBackground["color"] = color.name()
self.updateCorkColor()
# Update Cork view
self.mw.redacEditor.corkView.updateBackground()
if color.isValid():
settings.corkBackground["color"] = color.name()
self.updateCorkColor()
# Update Cork view
self.mw.redacEditor.corkView.updateBackground()
def updateCorkColor(self):
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())
self.colorDialog = QColorDialog(color, self)
color = self.colorDialog.getColor(color)
px = QPixmap(32, 32)
px.fill(color)
self.mw.mdlLabels.item(index.row()).setIcon(QIcon(px))
self.updateLabelColor(index)
if color.isValid():
px = QPixmap(32, 32)
px.fill(color)
self.mw.mdlLabels.item(index.row()).setIcon(QIcon(px))
self.updateLabelColor(index)