Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sat Jan 11 12:11:39 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sat Jan 11 12:55:28 2014 +0100
@@ -10,15 +10,14 @@
 import os
 
 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication
-from PyQt4.QtGui import QDialog, QDialogButtonBox, QFont, QHeaderView, \
-    QTreeWidgetItem, QLineEdit
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QLineEdit, \
+    QTreeWidgetItem
 
 from E5Gui import E5MessageBox
 
 from .Ui_HgAnnotateDialog import Ui_HgAnnotateDialog
 
 import Preferences
-import Utilities
 
 
 class HgAnnotateDialog(QDialog, Ui_HgAnnotateDialog):
@@ -43,11 +42,7 @@
         
         self.annotateList.headerItem().setText(
             self.annotateList.columnCount(), "")
-        font = QFont(self.annotateList.font())
-        if Utilities.isWindowsPlatform():
-            font.setFamily("Lucida Console")
-        else:
-            font.setFamily("Monospace")
+        font = Preferences.getEditorOtherFonts("MonospacedFont")
         self.annotateList.setFont(font)
         
         self.__ioEncoding = Preferences.getSystem("IOEncoding")

--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sat Jan 11 12:11:39 2014 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sat Jan 11 12:55:28 2014 +0100
@@ -12,13 +12,12 @@
 import pysvn
 
 from PyQt4.QtCore import QMutexLocker, Qt
-from PyQt4.QtGui import QHeaderView, QDialog, QDialogButtonBox, QFont, \
-    QTreeWidgetItem
+from PyQt4.QtGui import QHeaderView, QDialog, QDialogButtonBox, QTreeWidgetItem
 
 from .SvnDialogMixin import SvnDialogMixin
 from .Ui_SvnBlameDialog import Ui_SvnBlameDialog
 
-import Utilities
+import Preferences
 
 
 class SvnBlameDialog(QDialog, SvnDialogMixin, Ui_SvnBlameDialog):
@@ -42,11 +41,7 @@
         self.vcs = vcs
         
         self.blameList.headerItem().setText(self.blameList.columnCount(), "")
-        font = QFont(self.blameList.font())
-        if Utilities.isWindowsPlatform():
-            font.setFamily("Lucida Console")
-        else:
-            font.setFamily("Monospace")
+        font = Preferences.getEditorOtherFonts("MonospacedFont")
         self.blameList.setFont(font)
         
         self.client = self.vcs.getClient()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sat Jan 11 12:11:39 2014 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sat Jan 11 12:55:28 2014 +0100
@@ -11,14 +11,13 @@
 
 from PyQt4.QtCore import QTimer, QProcess, Qt, pyqtSlot
 from PyQt4.QtGui import QHeaderView, QLineEdit, QDialog, QDialogButtonBox, \
-    QFont, QTreeWidgetItem
+    QTreeWidgetItem
 
 from E5Gui import E5MessageBox
 
 from .Ui_SvnBlameDialog import Ui_SvnBlameDialog
 
 import Preferences
-import Utilities
 
 
 class SvnBlameDialog(QDialog, Ui_SvnBlameDialog):
@@ -42,11 +41,7 @@
         self.vcs = vcs
         
         self.blameList.headerItem().setText(self.blameList.columnCount(), "")
-        font = QFont(self.blameList.font())
-        if Utilities.isWindowsPlatform():
-            font.setFamily("Lucida Console")
-        else:
-            font.setFamily("Monospace")
+        font = Preferences.getEditorOtherFonts("MonospacedFont")
         self.blameList.setFont(font)
         
         self.__ioEncoding = Preferences.getSystem("IOEncoding")

--- a/UI/FindFileDialog.py	Sat Jan 11 12:11:39 2014 +0100
+++ b/UI/FindFileDialog.py	Sat Jan 11 12:55:28 2014 +0100
@@ -102,11 +102,7 @@
         self.__section0Size = self.findList.header().sectionSize(0)
         self.findList.setExpandsOnDoubleClick(False)
         if self.__replaceMode:
-            font = self.findList.font()
-            if Utilities.isWindowsPlatform():
-                font.setFamily("Lucida Console")
-            else:
-                font.setFamily("Monospace")
+            font = Preferences.getEditorOtherFonts("MonospacedFont")
             self.findList.setFont(font)
 
         # Qt Designer form files