- fixed bug in FlatCAMObj.FlatCAMGeometry.ui_disconnect(); the widgets signals were not disconnected from handlers when required therefore the signals were connected in an exponential way
- some changes in the widgets used in the Selected tab for Geometry object - some PEP8 cleanup in FlatCAMObj.py - updated languages - 60% progress in Spanish Google translation
This commit is contained in:
parent
75e3a06173
commit
e691c26b01
|
@ -16,10 +16,11 @@ from PyQt5.QtCore import QSettings
|
||||||
from flatcamGUI.GUIElements import log
|
from flatcamGUI.GUIElements import log
|
||||||
import gettext
|
import gettext
|
||||||
|
|
||||||
import builtins
|
|
||||||
|
|
||||||
if '_' not in builtins.__dict__:
|
# import builtins
|
||||||
_ = gettext.gettext
|
#
|
||||||
|
# if '_' not in builtins.__dict__:
|
||||||
|
# _ = gettext.gettext
|
||||||
|
|
||||||
# ISO639-1 codes from here: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
|
# ISO639-1 codes from here: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
|
||||||
languages_dict = {
|
languages_dict = {
|
||||||
|
|
|
@ -14,6 +14,8 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
- fixed bug in FlatCAMObj.FlatCAMGeometry.ui_disconnect(); the widgets signals were not disconnected from handlers when required therefore the signals were connected in an exponential way
|
- fixed bug in FlatCAMObj.FlatCAMGeometry.ui_disconnect(); the widgets signals were not disconnected from handlers when required therefore the signals were connected in an exponential way
|
||||||
- some changes in the widgets used in the Selected tab for Geometry object
|
- some changes in the widgets used in the Selected tab for Geometry object
|
||||||
- some PEP8 cleanup in FlatCAMObj.py
|
- some PEP8 cleanup in FlatCAMObj.py
|
||||||
|
- updated languages
|
||||||
|
- 60% progress in Spanish Google translation
|
||||||
|
|
||||||
17.07.2019
|
17.07.2019
|
||||||
|
|
||||||
|
|
|
@ -3152,7 +3152,7 @@ class GeneralPreferencesUI(QtWidgets.QWidget):
|
||||||
self.setLayout(self.layout)
|
self.setLayout(self.layout)
|
||||||
|
|
||||||
self.general_app_group = GeneralAppPrefGroupUI()
|
self.general_app_group = GeneralAppPrefGroupUI()
|
||||||
self.general_app_group.setFixedWidth(280)
|
self.general_app_group.setFixedWidth(290)
|
||||||
|
|
||||||
self.general_gui_group = GeneralGUIPrefGroupUI()
|
self.general_gui_group = GeneralGUIPrefGroupUI()
|
||||||
self.general_gui_group.setFixedWidth(250)
|
self.general_gui_group.setFixedWidth(250)
|
||||||
|
@ -3177,7 +3177,7 @@ class GerberPreferencesUI(QtWidgets.QWidget):
|
||||||
self.gerber_gen_group = GerberGenPrefGroupUI()
|
self.gerber_gen_group = GerberGenPrefGroupUI()
|
||||||
self.gerber_gen_group.setFixedWidth(250)
|
self.gerber_gen_group.setFixedWidth(250)
|
||||||
self.gerber_opt_group = GerberOptPrefGroupUI()
|
self.gerber_opt_group = GerberOptPrefGroupUI()
|
||||||
self.gerber_opt_group.setFixedWidth(230)
|
self.gerber_opt_group.setFixedWidth(250)
|
||||||
self.gerber_exp_group = GerberExpPrefGroupUI()
|
self.gerber_exp_group = GerberExpPrefGroupUI()
|
||||||
self.gerber_exp_group.setFixedWidth(230)
|
self.gerber_exp_group.setFixedWidth(230)
|
||||||
self.gerber_adv_opt_group = GerberAdvOptPrefGroupUI()
|
self.gerber_adv_opt_group = GerberAdvOptPrefGroupUI()
|
||||||
|
|
|
@ -80,7 +80,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||||
self.tools_box.addWidget(self.tools_table)
|
self.tools_box.addWidget(self.tools_table)
|
||||||
|
|
||||||
self.tools_table.setColumnCount(4)
|
self.tools_table.setColumnCount(4)
|
||||||
self.tools_table.setHorizontalHeaderLabels(['#', _('Diameter'), 'TT', ''])
|
self.tools_table.setHorizontalHeaderLabels(['#', _('Diameter'), _('TT'), ''])
|
||||||
self.tools_table.setColumnHidden(3, True)
|
self.tools_table.setColumnHidden(3, True)
|
||||||
self.tools_table.setSortingEnabled(False)
|
self.tools_table.setSortingEnabled(False)
|
||||||
# self.tools_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
|
# self.tools_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
|
||||||
|
|
|
@ -77,7 +77,7 @@ class ToolPaint(FlatCAMTool, Gerber):
|
||||||
self.tools_box.addWidget(self.tools_table)
|
self.tools_box.addWidget(self.tools_table)
|
||||||
|
|
||||||
self.tools_table.setColumnCount(4)
|
self.tools_table.setColumnCount(4)
|
||||||
self.tools_table.setHorizontalHeaderLabels(['#', _('Diameter'), 'TT', ''])
|
self.tools_table.setHorizontalHeaderLabels(['#', _('Diameter'), _('TT'), ''])
|
||||||
self.tools_table.setColumnHidden(3, True)
|
self.tools_table.setColumnHidden(3, True)
|
||||||
# self.tools_table.setSortingEnabled(False)
|
# self.tools_table.setSortingEnabled(False)
|
||||||
# self.tools_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
|
# self.tools_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
|
||||||
|
|
|
@ -175,14 +175,14 @@ class ToolSub(FlatCAMTool):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.intersect_btn.clicked.disconnect(self.on_grb_intersection_click)
|
self.intersect_btn.clicked.disconnect(self.on_grb_intersection_click)
|
||||||
except Exception as e:
|
except TypeError:
|
||||||
log.debug("ToolSub.__init__() --> %s" % str(e))
|
pass
|
||||||
self.intersect_btn.clicked.connect(self.on_grb_intersection_click)
|
self.intersect_btn.clicked.connect(self.on_grb_intersection_click)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.intersect_geo_btn.clicked.disconnect()
|
self.intersect_geo_btn.clicked.disconnect()
|
||||||
except Exception as e:
|
except TypeError:
|
||||||
log.debug("ToolSub.__init__() --> %s" % str(e))
|
pass
|
||||||
self.intersect_geo_btn.clicked.connect(self.on_geo_intersection_click)
|
self.intersect_geo_btn.clicked.connect(self.on_geo_intersection_click)
|
||||||
|
|
||||||
def install(self, icon=None, separator=None, **kwargs):
|
def install(self, icon=None, separator=None, **kwargs):
|
||||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue