diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4800f47c..52148964 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ CHANGELOG for FlatCAM beta
- some PEP changes, some method descriptions updated
- added a placeholder text to 2Sided Tool
- added a new menu entry in the context menu of the Tcl Shell: 'Save Log' which will save the content of the Tcl Shell browser window to a file
-
+- the status bar messages that are echoed in the Tcl Shell will no longer have all text colored but only the identifier
23.04.2020
diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index eeddfbfd..7bbf3518 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -2561,8 +2561,8 @@ class App(QtCore.QObject):
self.shell.setWindowIcon(self.ui.app_icon)
self.shell.setWindowTitle("FlatCAM Shell")
self.shell.resize(*self.defaults["global_shell_shape"])
- self.shell.append_output("FlatCAM %s - " % self.version)
- self.shell.append_output(_("Type >help< to get started\n\n"))
+ self.shell._append_to_browser('in', "FlatCAM %s - " % self.version)
+ self.shell.append_output('%s\n\n' % _("Type >help< to get started"))
self.ui.shell_dock.setWidget(self.shell)
diff --git a/flatcamGUI/GUIElements.py b/flatcamGUI/GUIElements.py
index 08abd842..040cf540 100644
--- a/flatcamGUI/GUIElements.py
+++ b/flatcamGUI/GUIElements.py
@@ -2588,9 +2588,13 @@ class _BrowserTextEdit(QTextEdit):
def clear(self):
QTextEdit.clear(self)
- text = "FlatCAM %s - Type >help< to get started\n\n" % self.version
+
+ text = "!FlatCAM %s? - %s" % (self.version, _("Type >help< to get started"))
text = html.escape(text)
- text = text.replace('\n', '
')
+ # hack so I can make text bold because the escape method will replace the '<' and '>' signs with html code
+ text = text.replace('!', '')
+ text = text.replace('?', '')
+ text += '
'
self.moveCursor(QTextCursor.End)
self.insertHtml(text)
diff --git a/flatcamTools/ToolShell.py b/flatcamTools/ToolShell.py
index e5fb0af1..edbb3c7d 100644
--- a/flatcamTools/ToolShell.py
+++ b/flatcamTools/ToolShell.py
@@ -101,20 +101,33 @@ class TermWidget(QWidget):
text = text.replace('\n', '
')
text = text.replace('\t', ' ')
+ idx = text.find(']')
+ mtype = text[:idx+1].upper()
+ mtype = mtype.replace('_NOTCL', '')
+ body = text[idx+1:]
if style == 'in':
text = '%s' % text
elif style == 'err':
- text = '%s' % text
+ text = '%s'\
+ '%s'\
+ %(mtype, body)
elif style == 'warning':
- text = '%s' % text
+ # text = '%s' % text
+ text = '%s' \
+ '%s' \
+ % (mtype, body)
elif style == 'success':
- text = '%s' % text
+ # text = '%s' % text
+ text = '%s' \
+ '%s' \
+ % (mtype, body)
elif style == 'selected':
text = ''
elif style == 'raw':
text = text
else:
- text = '%s' % text # without span
is ignored!!!
+ # without span
is ignored!!!
+ text = '%s' % text
scrollbar = self._browser.verticalScrollBar()
old_value = scrollbar.value()