diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 45962d4f..39e87ae9 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -6319,9 +6319,49 @@ class App(QtCore.QObject): self.log.debug("Recent items list has been populated.") def setup_component_editor(self): - label = QtWidgets.QLabel("Choose an item from Project") + # label = QtWidgets.QLabel("Choose an item from Project") + # label.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) + + self.sel_title = QtWidgets.QTextEdit( + 'Shortcut Key List') + self.sel_title.setTextInteractionFlags(QtCore.Qt.NoTextInteraction) + self.sel_title.setFrameStyle(QtWidgets.QFrame.NoFrame) + # font = self.sel_title.font() + # font.setPointSize(12) + # self.sel_title.setFont(font) + + self.selected_text = ''' +
Selected Tab - Choose an Item from Project Tab
+ +Details:
+The normal flow when working in FlatCAM is the following:
A list of key shortcuts is available through an menu entry in Help -> Shortcuts List or through it's own key shortcut: '`' (key left to 1).
+ + ''' + + self.sel_title.setText(self.selected_text) + self.sel_title.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) + + self.ui.selected_scroll_area.setWidget(self.sel_title) + + label = QtWidgets.QLabel("Choose a Tool from Tool Menu") label.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) - self.ui.selected_scroll_area.setWidget(label) + self.ui.tool_scroll_area.setWidget(label) def setup_obj_classes(self): """ diff --git a/README.md b/README.md index 01fb656d..0f402d38 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +5.02.3019 + +- added a text in the Selected Tab which is showed whenever the Selected Tab is selected but without having an object selected to display it's properties + 4.02.2019 - modified the Toolchange_Probe_general postprocessor file to remove any Z moves before the actual toolchange event diff --git a/flatcamTools/ToolNonCopperClear.py b/flatcamTools/ToolNonCopperClear.py index 7bc9f2d7..3768bd65 100644 --- a/flatcamTools/ToolNonCopperClear.py +++ b/flatcamTools/ToolNonCopperClear.py @@ -412,7 +412,6 @@ class NonCopperClear(FlatCAMTool, Gerber): self.tools_table.setMinimumHeight(self.tools_table.getHeight()) self.tools_table.setMaximumHeight(self.tools_table.getHeight()) - self.app.report_usage("gerber_on_ncc_button") self.ui_connect() def ui_connect(self):