Mercurial Repositories > eric / changeset
changeset
Changed the various diff dialogs to use the mono spaced font selected for the editor.
Sun, 14 Apr 2013 12:25:38 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 14 Apr 2013 12:25:38 +0200
- changeset 2580
- 7403bc14ea26
- parent 2579
- 35bb8c5eb7fe
- child 2581
- a3498dcc75cc
Changed the various diff dialogs to use the mono spaced font selected for the editor.
--- a/Plugins/AboutPlugin/AboutDialog.py Sat Apr 13 19:06:54 2013 +0200 +++ b/Plugins/AboutPlugin/AboutDialog.py Sun Apr 14 12:25:38 2013 +0200 @@ -11,7 +11,7 @@ from .Ui_AboutDialog import Ui_AboutDialog -import Utilities +import Preferences import UI.PixmapCache import UI.Info @@ -763,10 +763,9 @@ ## LICENSE #################################################################### - if Utilities.isWindowsPlatform(): - self.licenseEdit.setFontFamily("Lucida Console") - else: - self.licenseEdit.setFontFamily("Monospace") + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.contents.setFontFamily(font.family()) + self.contents.setFontPointSize(font.pointSize()) self.licenseEdit.setPlainText(licenseText)
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sat Apr 13 19:06:54 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sun Apr 14 12:25:38 2013 +0200 @@ -43,10 +43,9 @@ self.vcs = vcs self.__hgClient = self.vcs.getClient() - if Utilities.isWindowsPlatform(): - self.contents.setFontFamily("Lucida Console") - else: - self.contents.setFontFamily("Monospace") + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.contents.setFontFamily(font.family()) + self.contents.setFontPointSize(font.pointSize()) self.cNormalFormat = self.contents.currentCharFormat() self.cAddedFormat = self.contents.currentCharFormat()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sat Apr 13 19:06:54 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sun Apr 14 12:25:38 2013 +0200 @@ -22,6 +22,7 @@ from .Ui_SvnDiffDialog import Ui_SvnDiffDialog import Utilities +import Preferences class SvnDiffDialog(QWidget, SvnDialogMixin, Ui_SvnDiffDialog): @@ -45,10 +46,9 @@ self.vcs = vcs - if Utilities.isWindowsPlatform(): - self.contents.setFontFamily("Lucida Console") - else: - self.contents.setFontFamily("Monospace") + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.contents.setFontFamily(font.family()) + self.contents.setFontPointSize(font.pointSize()) self.cNormalFormat = self.contents.currentCharFormat() self.cAddedFormat = self.contents.currentCharFormat()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sat Apr 13 19:06:54 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sun Apr 14 12:25:38 2013 +0200 @@ -41,10 +41,9 @@ self.process = QProcess() self.vcs = vcs - if Utilities.isWindowsPlatform(): - self.contents.setFontFamily("Lucida Console") - else: - self.contents.setFontFamily("Monospace") + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.contents.setFontFamily(font.family()) + self.contents.setFontPointSize(font.pointSize()) self.cNormalFormat = self.contents.currentCharFormat() self.cAddedFormat = self.contents.currentCharFormat()
--- a/UI/CompareDialog.py Sat Apr 13 19:06:54 2013 +0200 +++ b/UI/CompareDialog.py Sun Apr 14 12:25:38 2013 +0200 @@ -120,12 +120,11 @@ self.on_synchronizeCheckBox_toggled(True) - if Utilities.isWindowsPlatform(): - self.contents_1.setFontFamily("Lucida Console") - self.contents_2.setFontFamily("Lucida Console") - else: - self.contents_1.setFontFamily("Monospace") - self.contents_2.setFontFamily("Monospace") + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.contents_1.setFontFamily(font.family()) + self.contents_1.setFontPointSize(font.pointSize()) + self.contents_2.setFontFamily(font.family()) + self.contents_2.setFontPointSize(font.pointSize()) self.fontHeight = QFontMetrics(self.contents_1.currentFont()).height() self.cNormalFormat = self.contents_1.currentCharFormat()
--- a/UI/DiffDialog.py Sat Apr 13 19:06:54 2013 +0200 +++ b/UI/DiffDialog.py Sun Apr 14 12:25:38 2013 +0200 @@ -224,10 +224,9 @@ self.updateInterval = 20 # update every 20 lines - if Utilities.isWindowsPlatform(): - self.contents.setFontFamily("Lucida Console") - else: - self.contents.setFontFamily("Monospace") + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.contents.setFontFamily(font.family()) + self.contents.setFontPointSize(font.pointSize()) self.cNormalFormat = self.contents.currentCharFormat() self.cAddedFormat = self.contents.currentCharFormat()
