- added some new strings for translation and updated the translation strings

- in ToolsDB2UI class made the vertical layouts have a preferred minimum dimension as opposed to the previous fixed one
- in Geometry Object made sure that the Tools Table second column is set to Resize to contents

CHANGELOG.md

@@ -19,6 +19,9 @@ CHANGELOG for FlatCAM beta
 - updated the Turkish translation (by Mehmet Kaya)
 - small change in the CNCJob UI by replacing the AL checkbox with a checkable QButton
 - disabled the Autolevelling feature in CNCJob due of being not finished and missing also a not-yet-released package: Shapely v 1.8
+- added some new strings for translation and updated the translation strings
+- in ToolsDB2UI class made the vertical layouts have a preferred minimum dimension as opposed to the previous fixed one
+- in Geometry Object made sure that the Tools Table second column is set to Resize to contents
 
 21.10.2020
 

appDatabase.py

@@ -993,7 +993,7 @@ class ToolsDB2UI:
         """)
         self.description_vlay = QtWidgets.QVBoxLayout()
         self.tool_description_box.setTitle(_("Tool Description"))
-        self.tool_description_box.setFixedWidth(250)
+        self.tool_description_box.setMinimumWidth(250)
 
         # Milling box
         self.milling_box = QtWidgets.QGroupBox()
@@ -1006,7 +1006,7 @@ class ToolsDB2UI:
         """)
         self.milling_vlay = QtWidgets.QVBoxLayout()
         self.milling_box.setTitle(_("Milling Parameters"))
-        self.milling_box.setFixedWidth(250)
+        self.milling_box.setMinimumWidth(250)
 
         # NCC TOOL BOX
         self.ncc_box = QtWidgets.QGroupBox()
@@ -1019,7 +1019,7 @@ class ToolsDB2UI:
                         """)
         self.ncc_vlay = QtWidgets.QVBoxLayout()
         self.ncc_box.setTitle(_("NCC Parameters"))
-        self.ncc_box.setFixedWidth(250)
+        self.ncc_box.setMinimumWidth(250)
 
         # PAINT TOOL BOX
         self.paint_box = QtWidgets.QGroupBox()
@@ -1032,7 +1032,7 @@ class ToolsDB2UI:
                         """)
         self.paint_vlay = QtWidgets.QVBoxLayout()
         self.paint_box.setTitle(_("Paint Parameters"))
-        self.paint_box.setFixedWidth(250)
+        self.paint_box.setMinimumWidth(250)
 
         # ISOLATION TOOL BOX
         self.iso_box = QtWidgets.QGroupBox()
@@ -1045,7 +1045,7 @@ class ToolsDB2UI:
                      """)
         self.iso_vlay = QtWidgets.QVBoxLayout()
         self.iso_box.setTitle(_("Isolation Parameters"))
-        self.iso_box.setFixedWidth(250)
+        self.iso_box.setMinimumWidth(250)
 
         # DRILLING TOOL BOX
         self.drill_box = QtWidgets.QGroupBox()
@@ -1058,7 +1058,7 @@ class ToolsDB2UI:
                      """)
         self.drill_vlay = QtWidgets.QVBoxLayout()
         self.drill_box.setTitle(_("Drilling Parameters"))
-        self.drill_box.setFixedWidth(250)
+        self.drill_box.setMinimumWidth(250)
 
         # CUTOUT TOOL BOX
         self.cutout_box = QtWidgets.QGroupBox()
@@ -1071,7 +1071,7 @@ class ToolsDB2UI:
                      """)
         self.cutout_vlay = QtWidgets.QVBoxLayout()
         self.cutout_box.setTitle(_("Cutout Parameters"))
-        self.cutout_box.setFixedWidth(250)
+        self.cutout_box.setMinimumWidth(250)
 
         # Layout Constructor
         self.tool_description_box.setLayout(self.description_vlay)

appEditors/AppGeoEditor.py

@@ -310,7 +310,7 @@ class TextInputTool(AppTool):
         self.font_italic_tb.setIcon(QtGui.QIcon(self.app.resource_location + '/italic32.png'))
         hlay.addWidget(self.font_italic_tb)
 
-        self.form_layout.addRow(FCLabel('%s:' % "Size"), hlay)
+        self.form_layout.addRow(FCLabel('%s:' % _("Size")), hlay)
 
         # Text input
         self.text_input_entry = FCTextAreaRich()

appGUI/MainGUI.py

@@ -909,7 +909,7 @@ class MainGUI(QtWidgets.QMainWindow):
         # ########################## Shell Toolbar# ##############################
         # ########################################################################
         self.shell_btn = self.toolbarshell.addAction(
-            QtGui.QIcon(self.app.resource_location + '/shell32.png'), _("&Command Line"))
+            QtGui.QIcon(self.app.resource_location + '/shell32.png'), _("Command Line"))
         self.new_script_btn = self.toolbarshell.addAction(
             QtGui.QIcon(self.app.resource_location + '/script_new24.png'), _('New Script ...'))
         self.open_script_btn = self.toolbarshell.addAction(
@@ -1191,7 +1191,7 @@ class MainGUI(QtWidgets.QMainWindow):
         # #######################################################################
         # ####################### TCL Shell DOCK ################################
         # #######################################################################
-        self.shell_dock = FCDock("TCL Shell", close_callback=self.toggle_shell_ui)
+        self.shell_dock = FCDock(_("TCL Shell"), close_callback=self.toggle_shell_ui)
         self.shell_dock.setObjectName('Shell_DockWidget')
         self.shell_dock.setAllowedAreas(QtCore.Qt.AllDockWidgetAreas)
         self.shell_dock.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable |
@@ -3788,13 +3788,13 @@ class MainGUI(QtWidgets.QMainWindow):
         try:
             name = self.plot_tab_area.widget(0).objectName()
         except AttributeError:
-            self.plot_tab_area.addTab(self.plot_tab, "Plot Area")
+            self.plot_tab_area.addTab(self.plot_tab, _("Plot Area"))
             # remove the close button from the Plot Area tab (first tab index = 0) as this one will always be ON
             self.plot_tab_area.protectTab(0)
             return
 
         if name != 'plotarea_tab':
-            self.plot_tab_area.insertTab(0, self.plot_tab, "Plot Area")
+            self.plot_tab_area.insertTab(0, self.plot_tab, _("Plot Area"))
             # remove the close button from the Plot Area tab (first tab index = 0) as this one will always be ON
             self.plot_tab_area.protectTab(0)
         else:

appObjects/FlatCAMGeometry.py

@@ -269,6 +269,7 @@ class GeometryObject(FlatCAMObj, Geometry):
         horizontal_header.resizeSection(0, 20)
         horizontal_header.setSectionResizeMode(1, QtWidgets.QHeaderView.Stretch)
         # horizontal_header.setColumnWidth(2, QtWidgets.QHeaderView.ResizeToContents)
+        horizontal_header.setSectionResizeMode(2, QtWidgets.QHeaderView.ResizeToContents)
         horizontal_header.setSectionResizeMode(3, QtWidgets.QHeaderView.ResizeToContents)
         horizontal_header.setSectionResizeMode(4, QtWidgets.QHeaderView.Fixed)
         horizontal_header.resizeSection(4, 40)

appTools/ToolShell.py

@@ -290,7 +290,7 @@ class FCShell(TermWidget):
 
         self._edit.set_model_data(self.app.myKeywords)
         self.setWindowIcon(self.app.ui.app_icon)
-        self.setWindowTitle("FlatCAM Shell")
+        self.setWindowTitle(_("FlatCAM Shell"))
         self.resize(*self.app.defaults["global_shell_shape"])
         self._append_to_browser('in', "FlatCAM %s - " % version)
         self.append_output('%s\n\n' % _("Type >help< to get started"))

app_Main.py

@@ -2258,7 +2258,7 @@ class App(QtCore.QObject):
         else:
             self.old_state_of_tools_toolbar = False
 
-        self.ui.plot_tab_area.setTabText(0, "EDITOR Area")
+        self.ui.plot_tab_area.setTabText(0, _("EDITOR Area"))
         self.ui.plot_tab_area.protectTab(0)
         self.inform.emit('[WARNING_NOTCL] %s' % _("Editor is activated ..."))