bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- minor changes in the way that the tools are installed and connected

Browse Source
This commit is contained in:
Marius Stanciu
2020-06-08 19:28:39 +03:00
committed by Marius
parent c915ea8f6d
commit d97d3eabd2
5 changed files with 93 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appGUI/preferences/general/GeneralAppPrefGroupUI.py
View File

@@ -95,7 +95,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0.addWidget(separator_line, 4, 0, 1, 2)
# Application Level for FlatCAM
self.app_level_label = QtWidgets.QLabel('<span style="color:red;"><b>%s:</b></span>' % _('APP. LEVEL'))
self.app_level_label = QtWidgets.QLabel('<span style="color:red;"><b>%s:</b></span>' % _('APPLICATION LEVEL'))
self.app_level_label.setToolTip(_("Choose the default level of usage for FlatCAM.\n"
"BASIC level -> reduced functionality, best for beginner's.\n"
"ADVANCED level -> full functionality.\n\n"
@@ -104,8 +104,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
self.app_level_radio = RadioSet([{'label': _('Basic'), 'value': 'b'},
{'label': _('Advanced'), 'value': 'a'}])
grid0.addWidget(self.app_level_label, 5, 0)
grid0.addWidget(self.app_level_radio, 5, 1)
grid0.addWidget(self.app_level_label, 5, 0, 1, 2)
grid0.addWidget(self.app_level_radio, 6, 0, 1, 2)
# Portability for FlatCAM
self.portability_cb = FCCheckBox('%s' % _('Portable app'))
@@ -114,20 +114,20 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
"which means that the preferences files will be saved\n"
"in the application folder, in the lib\\config subfolder."))
grid0.addWidget(self.portability_cb, 6, 0, 1, 2)
grid0.addWidget(self.portability_cb, 7, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
grid0.addWidget(separator_line, 7, 0, 1, 2)
grid0.addWidget(separator_line, 8, 0, 1, 2)
# Languages for FlatCAM
self.languagelabel = QtWidgets.QLabel('<b>%s</b>' % _('Languages'))
self.languagelabel.setToolTip(_("Set the language used throughout FlatCAM."))
self.language_cb = FCComboBox()
grid0.addWidget(self.languagelabel, 8, 0, 1, 2)
grid0.addWidget(self.language_cb, 9, 0, 1, 2)
grid0.addWidget(self.languagelabel, 9, 0, 1, 2)
grid0.addWidget(self.language_cb, 10, 0, 1, 2)
self.language_apply_btn = FCButton(_("Apply Language"))
self.language_apply_btn.setToolTip(_("Set the language used throughout FlatCAM.\n"

8
appGUI/preferences/general/GeneralGUIPrefGroupUI.py
View File

@@ -531,8 +531,12 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
# add all the actions to the toolbars
self.app.ui.populate_toolbars()
# reconnect all the signals to the toolbar actions
self.app.connect_toolbar_signals()
try:
# reconnect all the signals to the toolbar actions
self.app.connect_toolbar_signals(ui=self.app.ui)
except Exception as e:
self.app.log.debug(
"appGUI.preferences.general.GeneralGUIPrefGroupUI.on_layout() - connect toolbar signals -> %s" % str(e))
self.app.ui.grid_snap_btn.setChecked(True)