- fixed issue when doing th CTRL (or SHIFT) + LMB, the focus is automatically moved to Project Tab

- further work in internationalization, added a fallback to English language in case there is no translation for a string
This commit is contained in:
Marius Stanciu
2019-03-08 14:10:23 +02:00
parent 328182d863
commit 6ba037fd83
22 changed files with 1012 additions and 843 deletions

View File

@@ -18,6 +18,13 @@ import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolShell')
def _tr(text):
try:
return _(text)
except:
return text
class TermWidget(QWidget):
"""
Widget wich represents terminal. It only displays text and allows to enter text.
@@ -62,9 +69,9 @@ class TermWidget(QWidget):
self._edit.setTextColor(Qt.white)
self._edit.setTextBackgroundColor(Qt.darkGreen)
if detail is None:
self._edit.setPlainText(_("...proccessing..."))
self._edit.setPlainText(_tr("...proccessing..."))
else:
self._edit.setPlainText(_("...proccessing... [%s]") % detail)
self._edit.setPlainText(_tr("...proccessing... [%s]") % detail)
self._edit.setDisabled(True)
self._edit.setFocus()