From a44d7b97b561d8751efcc1e698bb39c1ea5bcdfd Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 30 Jan 2020 05:55:46 +0200 Subject: [PATCH] - some changed in the Excellon UI --- FlatCAMObj.py | 13 ++++++++++++- README.md | 1 + flatcamGUI/ObjectUI.py | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 8cbc596a..3ed53b66 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -2868,7 +2868,18 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): sel_rows = row if type(row) == list else [row] if not sel_rows: - sel_rows = [0] + self.ui.tool_data_label.setText( + "%s: %s" % (_('Parameters for'), _("No Tool Selected")) + ) + self.ui.generate_cnc_button.setDisabled(True) + self.ui.generate_milling_button.setDisabled(True) + self.ui.generate_milling_slots_button.setDisabled(True) + self.ui_connect() + return + else: + self.ui.generate_cnc_button.setDisabled(False) + self.ui.generate_milling_button.setDisabled(False) + self.ui.generate_milling_slots_button.setDisabled(False) if len(sel_rows) == 1: # update the QLabel that shows for which Tool we have the parameters in the UI form diff --git a/README.md b/README.md index 9a1c3463..e16d8193 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing. 30.01.2020 - remade GUI in Tool Cutout, Tool Align Objects, Tool Panelize +- some changed in the Excellon UI 29.01.2020 diff --git a/flatcamGUI/ObjectUI.py b/flatcamGUI/ObjectUI.py index 3d97ccb6..6a0b2df5 100644 --- a/flatcamGUI/ObjectUI.py +++ b/flatcamGUI/ObjectUI.py @@ -1248,7 +1248,7 @@ class ExcellonObjectUI(ObjectUI): warning_lbl = QtWidgets.QLabel( _( "Add / Select at least one tool in the tool-table.\n" - "Click the header to select all, or Ctrl + LMB\n" + "Click the # header to select all, or Ctrl + LMB\n" "for custom selection of tools." )) @@ -1946,7 +1946,7 @@ class GeometryObjectUI(ObjectUI): warning_lbl = QtWidgets.QLabel( _( "Add / Select at least one tool in the tool-table.\n" - "Click the header to select all, or Ctrl + LMB\n" + "Click the # header to select all, or Ctrl + LMB\n" "for custom selection of tools." )) self.grid4.addWidget(warning_lbl, 6, 0, 1, 2)