From c339e9cae80ce6234eadfbae501effa8f59ae2b5 Mon Sep 17 00:00:00 2001
From: Olivier Keshavjee <olivier.keshavjee@gmail.com>
Date: Wed, 17 Jun 2015 21:17:12 +0200
Subject: [PATCH] Corrects small things with characters

---
 src/mainWindow.py              | 15 +++++++--------
 src/models/persosProxyModel.py |  5 ++++-
 src/settingsWindow.py          | 18 ++++++++++--------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/mainWindow.py b/src/mainWindow.py
index 6e2e848..3a65e1e 100644
--- a/src/mainWindow.py
+++ b/src/mainWindow.py
@@ -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)
diff --git a/src/models/persosProxyModel.py b/src/models/persosProxyModel.py
index 6f2999d..8aa68e2 100644
--- a/src/models/persosProxyModel.py
+++ b/src/models/persosProxyModel.py
@@ -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()
diff --git a/src/settingsWindow.py b/src/settingsWindow.py
index be8cffa..f349eee 100644
--- a/src/settingsWindow.py
+++ b/src/settingsWindow.py
@@ -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)
\ No newline at end of file
+        if color.isValid():
+            px = QPixmap(32, 32)
+            px.fill(color)
+            self.mw.mdlLabels.item(index.row()).setIcon(QIcon(px))
+            self.updateLabelColor(index)
\ No newline at end of file