- small change in the NCC Tool UI

- some strings are changed and therefore the translation strings source are updated

CHANGELOG.md

@@ -7,6 +7,11 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+8.10.2020
+
+- small change in the NCC Tool UI
+- some strings are changed and therefore the translation strings source are updated
+
 7.10.2020
 
 - working on adding DPI setting for PNG export in Film Tool - update

appGUI/ObjectUI.py

@@ -980,8 +980,9 @@ class GeometryObjectUI(ObjectUI):
         self.addtool_from_db_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/search_db32.png'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool Database.\n"
-              "Tool database administration in Menu: Options -> Tools Database")
+              "from the Tools Database.\n"
+              "Tools database administration in in:\n"
+              "Menu: Options -> Tools Database")
         )
 
         bhlay.addWidget(self.addtool_btn)

appTools/ToolCutOut.py

@@ -2082,8 +2082,9 @@ class CutoutUI:
         self.addtool_from_db_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/search_db32.png'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool Database.\n"
-              "Tool database administration in Menu: Options -> Tools Database")
+              "from the Tools Database.\n"
+              "Tools database administration in in:\n"
+              "Menu: Options -> Tools Database")
         )
         hlay.addWidget(self.addtool_from_db_btn)
 

appTools/ToolIsolation.py

@@ -3096,8 +3096,9 @@ class IsoUI:
         self.addtool_from_db_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/search_db32.png'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool Database.\n"
-              "Tool database administration in Menu: Options -> Tools Database")
+              "from the Tools Database.\n"
+              "Tools database administration in in:\n"
+              "Menu: Options -> Tools Database")
         )
         bhlay.addWidget(self.addtool_from_db_btn)
 

appTools/ToolNCC.py

@@ -3857,26 +3857,31 @@ class NccUI:
         # ### Tool Diameter ####
         self.new_tooldia_lbl = FCLabel('%s:' % _('Tool Dia'))
         self.new_tooldia_lbl.setToolTip(
-            _("Diameter for the new tool to add in the Tool Table.\n"
-              "If the tool is V-shape type then this value is automatically\n"
-              "calculated from the other parameters.")
+            _("Diameter for the new tool")
         )
+        self.grid3.addWidget(self.new_tooldia_lbl, 2, 0)
+
+        new_tool_lay = QtWidgets.QHBoxLayout()
+
         self.new_tooldia_entry = FCDoubleSpinner(callback=self.confirmation_message)
         self.new_tooldia_entry.set_precision(self.decimals)
         self.new_tooldia_entry.set_range(0.000, 9999.9999)
         self.new_tooldia_entry.setObjectName(_("Tool Dia"))
 
-        self.grid3.addWidget(self.new_tooldia_lbl, 2, 0)
-        self.grid3.addWidget(self.new_tooldia_entry, 2, 1)
+        new_tool_lay.addWidget(self.new_tooldia_entry)
 
         # Find Optimal Tooldia
-        self.find_optimal_button = FCButton(_('Find Optimal'))
+        self.find_optimal_button = QtWidgets.QToolButton()
+        self.find_optimal_button.setText(_('Optimal'))
         self.find_optimal_button.setIcon(QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'))
+        self.find_optimal_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
         self.find_optimal_button.setToolTip(
             _("Find a tool diameter that is guaranteed\n"
               "to do a complete isolation.")
         )
-        self.grid3.addWidget(self.find_optimal_button, 4, 0, 1, 2)
+        new_tool_lay.addWidget(self.find_optimal_button)
+
+        self.grid3.addLayout(new_tool_lay, 2, 1)
 
         hlay = QtWidgets.QHBoxLayout()
 
@@ -3895,8 +3900,9 @@ class NccUI:
         self.addtool_from_db_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/search_db32.png'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool Database.\n"
-              "Tool database administration in Menu: Options -> Tools Database")
+              "from the Tools Database.\n"
+              "Tools database administration in in:\n"
+              "Menu: Options -> Tools Database")
         )
         hlay.addWidget(self.addtool_from_db_btn)
 

appTools/ToolPaint.py

@@ -2909,8 +2909,9 @@ class PaintUI:
         self.addtool_from_db_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/search_db32.png'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool Database.\n"
-              "Tool database administration in Menu: Options -> Tools Database")
+              "from the Tools Database.\n"
+              "Tools database administration in in:\n"
+              "Menu: Options -> Tools Database")
         )
         hlay.addWidget(self.addtool_from_db_btn)