mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-06-01 10:39:34 +12:00
Corrects small things with characters
This commit is contained in:
parent
4e54a23d13
commit
c339e9cae8
|
@ -324,11 +324,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
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)
|
||||
|
@ -355,6 +353,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
color = Qt.white
|
||||
self.colorDialog = QColorDialog(color, self)
|
||||
color = self.colorDialog.getColor(color)
|
||||
if color.isValid():
|
||||
self.setPersoColor(idx.row(), color)
|
||||
self.updatePersoColor()
|
||||
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -170,6 +170,7 @@ class settingsWindow(QWidget, Ui_Settings):
|
|||
color = QColor(settings.corkBackground["color"])
|
||||
self.colorDialog = QColorDialog(color, self)
|
||||
color = self.colorDialog.getColor(color)
|
||||
if color.isValid():
|
||||
settings.corkBackground["color"] = color.name()
|
||||
self.updateCorkColor()
|
||||
# Update Cork view
|
||||
|
@ -243,6 +244,7 @@ class settingsWindow(QWidget, Ui_Settings):
|
|||
color = iconColor(self.mw.mdlLabels.item(index.row()).icon())
|
||||
self.colorDialog = QColorDialog(color, self)
|
||||
color = self.colorDialog.getColor(color)
|
||||
if color.isValid():
|
||||
px = QPixmap(32, 32)
|
||||
px.fill(color)
|
||||
self.mw.mdlLabels.item(index.row()).setIcon(QIcon(px))
|
||||
|
|
Loading…
Reference in a new issue