- update in Code Highlighter to highlight the X and Y chars

- updated the Document and Script objects Beginner/Advanced selection labels to the same as the rest of the app objects
This commit is contained in:
Marius Stanciu
2021-02-27 04:48:00 +02:00
committed by Marius
parent 1dbdb917fb
commit ca748d9a02
4 changed files with 100 additions and 8 deletions

View File

@@ -77,10 +77,8 @@ class ScriptObject(FlatCAMObj):
self.to_form()
# Show/Hide Advanced Options
if self.app.defaults["global_app_level"] == 'b':
self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Beginner"))
else:
self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _("Advanced"))
app_mode = self.app.defaults["global_app_level"]
self.change_level(app_mode)
self.script_editor_tab = AppTextEditor(app=self.app, plain_text=True, parent=self.app.ui)
@@ -112,6 +110,12 @@ class ScriptObject(FlatCAMObj):
self.app.ui.plot_tab_area.setCurrentWidget(self.script_editor_tab)
flt = "FlatCAM Scripts (*.FlatScript);;All Files (*.*)"
# #############################################################################
# ############################ SIGNALS ########################################
# #############################################################################
self.ui.level.toggled.connect(self.on_level_changed)
self.script_editor_tab.buttonOpen.clicked.disconnect()
self.script_editor_tab.buttonOpen.clicked.connect(lambda: self.script_editor_tab.handleOpen(filt=flt))
self.script_editor_tab.buttonSave.clicked.disconnect()
@@ -157,6 +161,39 @@ class ScriptObject(FlatCAMObj):
self.script_editor_tab.setObjectName(self.options['name'])
self.app.ui.plot_tab_area.setCurrentWidget(self.script_editor_tab)
def change_level(self, level):
"""
:param level: application level: either 'b' or 'a'
:type level: str
:return:
"""
if level == 'a':
self.ui.level.setChecked(True)
else:
self.ui.level.setChecked(False)
self.on_level_changed(self.ui.level.isChecked())
def on_level_changed(self, checked):
if not checked:
self.ui.level.setText('%s' % _('Beginner'))
self.ui.level.setStyleSheet("""
QToolButton
{
color: green;
}
""")
else:
self.ui.level.setText('%s' % _('Advanced'))
self.ui.level.setStyleSheet("""
QToolButton
{
color: red;
}
""")
def parse_file(self, filename):
"""
Will set an attribute of the object, self.source_file, with the parsed data.