giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged jpcgt/flatcam:Beta into uenz1/flatcam:FixTlxCommandMillDrills

This commit is contained in:
Andre Spahlinger 2021-01-02 14:20:39 +00:00
parent 0488337672 1902575b93
commit c7ed8914de
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
appTools/ToolShell.py
View File

@ -7,7 +7,7 @@
# ########################################################## # ##########################################################
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt, QSettings
from PyQt5.QtGui import QTextCursor, QPixmap from PyQt5.QtGui import QTextCursor, QPixmap
from PyQt5.QtWidgets import QVBoxLayout, QWidget, QHBoxLayout, QLabel from PyQt5.QtWidgets import QVBoxLayout, QWidget, QHBoxLayout, QLabel
from appGUI.GUIElements import _BrowserTextEdit, _ExpandableTextEdit, FCLabel from appGUI.GUIElements import _BrowserTextEdit, _ExpandableTextEdit, FCLabel
@ -41,7 +41,12 @@ class TermWidget(QWidget):
self.app = app self.app = app
self._browser = _BrowserTextEdit(version=version, app=app) self._browser = _BrowserTextEdit(version=version, app=app)
self._browser.setStyleSheet("font: 9pt \"Courier\";") qsettings = QSettings("Open Source", "FlatCAM")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else:
tb_fsize = 9
self._browser.setStyleSheet("font: {0}pt \"Courier\";".format(tb_fsize))
self._browser.setReadOnly(True) self._browser.setReadOnly(True)
self._browser.document().setDefaultStyleSheet( self._browser.document().setDefaultStyleSheet(
self._browser.document().defaultStyleSheet() + self._browser.document().defaultStyleSheet() +
@ -478,7 +483,8 @@ class FCShell(TermWidget):
trc_formated = [] trc_formated = []
for a in reversed(trc): for a in reversed(trc):
trc_formated.append(a.replace(" ", " > ").replace("\n", "")) trc_formated.append(a.replace(" ", " > ").replace("\n", ""))
text = "%s\nPython traceback: %s\n%s" % (exc_value, exc_type, "\n".join(trc_formated)) text = "%s\nPython traceback: %s\n%s" % (
exc_value, exc_type, "\n".join(trc_formated))
else: else:
text = "%s" % error text = "%s" % error
else: else:

4
setup_ubuntu.sh
View File

@ -44,6 +44,8 @@ sudo -H python3 -m pip install --upgrade \
qrcode \ qrcode \
pyqt5 \ pyqt5 \
reportlab \ reportlab \
svglib svglib \
pyserial \
testresources
sudo -H easy_install -U distribute sudo -H easy_install -U distribute