- 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

FlatCAMTranslation.py

@@ -16,10 +16,11 @@ from PyQt5.QtCore import QSettings
 from flatcamGUI.GUIElements import log
 import gettext
 
-import builtins
 
-if '_' not in builtins.__dict__:
-    _ = gettext.gettext
+# import builtins
+#
+# if '_' not in builtins.__dict__:
+#     _ = gettext.gettext
 
 # ISO639-1 codes from here: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 languages_dict = {

README.md

@@ -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
 - 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
 
 17.07.2019
 

flatcamGUI/FlatCAMGUI.py

@@ -3152,7 +3152,7 @@ class GeneralPreferencesUI(QtWidgets.QWidget):
         self.setLayout(self.layout)
 
         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.setFixedWidth(250)
@@ -3177,7 +3177,7 @@ class GerberPreferencesUI(QtWidgets.QWidget):
         self.gerber_gen_group = GerberGenPrefGroupUI()
         self.gerber_gen_group.setFixedWidth(250)
         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.setFixedWidth(230)
         self.gerber_adv_opt_group = GerberAdvOptPrefGroupUI()

flatcamTools/ToolNonCopperClear.py

@@ -80,7 +80,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
         self.tools_box.addWidget(self.tools_table)
 
         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.setSortingEnabled(False)
         # self.tools_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)

flatcamTools/ToolPaint.py

@@ -77,7 +77,7 @@ class ToolPaint(FlatCAMTool, Gerber):
         self.tools_box.addWidget(self.tools_table)
 
         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.setSortingEnabled(False)
         # self.tools_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)

flatcamTools/ToolSub.py

@@ -175,14 +175,14 @@ class ToolSub(FlatCAMTool):
 
         try:
             self.intersect_btn.clicked.disconnect(self.on_grb_intersection_click)
-        except Exception as e:
-            log.debug("ToolSub.__init__() --> %s" % str(e))
+        except TypeError:
+            pass
         self.intersect_btn.clicked.connect(self.on_grb_intersection_click)
 
         try:
             self.intersect_geo_btn.clicked.disconnect()
-        except Exception as e:
-            log.debug("ToolSub.__init__() --> %s" % str(e))
+        except TypeError:
+            pass
         self.intersect_geo_btn.clicked.connect(self.on_geo_intersection_click)
 
     def install(self, icon=None, separator=None, **kwargs):