diff options
| author | Adrien Tétar | 2015-10-30 14:59:25 +0100 |
|---|---|---|
| committer | Adrien Tétar | 2015-10-30 14:59:25 +0100 |
| commit | 2d606bf4accce2bcc274b626d3d6ee876aadb1c2 (patch) | |
| tree | 169009ce4eacd9c1f0db900d879a0684e859b43c | |
| parent | 71dd524b999d999d361ab16a2f99c092c8ee0d27 (diff) | |
| parent | f6faf7242d03edb4b72d91d6755754f5482a9504 (diff) | |
| download | trufont-2d606bf4accce2bcc274b626d3d6ee876aadb1c2.tar.bz2 | |
Merge pull request #99 from trufont/patch-9
fontInfo: fix integerFloatList writing, metricsWindow: update fix
| -rw-r--r-- | Lib/defconQt/fontInfo.py | 12 | ||||
| -rw-r--r-- | Lib/defconQt/metricsWindow.py | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Lib/defconQt/fontInfo.py b/Lib/defconQt/fontInfo.py index 93fc3df..0439e24 100644 --- a/Lib/defconQt/fontInfo.py +++ b/Lib/defconQt/fontInfo.py @@ -1,6 +1,7 @@ -from PyQt5.QtCore import QDate, QDateTime, QTime, Qt +from PyQt5.QtCore import QDate, QDateTime, QRegularExpression, QTime, Qt from PyQt5.QtGui import ( - QDoubleValidator, QIntValidator, QStandardItem, QStandardItemModel) + QDoubleValidator, QIntValidator, QRegularExpressionValidator, + QStandardItem, QStandardItemModel) from PyQt5.QtWidgets import ( QCheckBox, QComboBox, QDateTimeEdit, QDialog, QDialogButtonBox, QGridLayout, QGroupBox, QLabel, QLineEdit, QListView, QPlainTextEdit, @@ -90,7 +91,6 @@ class TabWidget(QWidget): else: value = "" setattr(self, dst + "Edit", QLineEdit(value, self)) - getattr(self, dst + "Edit").setValidator(QIntValidator(self)) validator = QIntValidator(self) validator.setBottom(0) getattr(self, dst + "Edit").setValidator(validator) @@ -131,9 +131,13 @@ class TabWidget(QWidget): def loadIntegerFloatList(self, font, src, dst): values = " ".join(str(val) for val in getattr(font.info, src)) setattr(self, dst + "Edit", QLineEdit(values, self)) + validator = QRegularExpressionValidator(self) + validator.setRegularExpression( + QRegularExpression("(-?\d+(.\d+)?\s*)*")) + getattr(self, dst + "Edit").setValidator(validator) def writeIntegerFloatList(self, font, src, dst): - values = getattr(self, src + "Edit").text() + values = getattr(self, src + "Edit").text().split() dstValues = [] for val in values: if "." in val: diff --git a/Lib/defconQt/metricsWindow.py b/Lib/defconQt/metricsWindow.py index c62b40e..04ebfbb 100644 --- a/Lib/defconQt/metricsWindow.py +++ b/Lib/defconQt/metricsWindow.py @@ -93,8 +93,7 @@ class MainMetricsWindow(QWidget): self.canvas.update() def _glyphChanged(self, notification): - if not self.canvas._editing: - self.canvas.update() + self.canvas.update() if not self.table._editing: self.table.updateCells(self.canvas._editing) |