- the Selected Tab is now Properties Tab for FlatCAM objects
- modified the Properties Tab for various FlatCAM objects preparing the move of Properties Tool data into the Properties Tab - if the Properties tab is in focus (selected) when a new object is created then it is automatically selected therefore it's properties will be populated
This commit is contained in:
@@ -1960,8 +1960,8 @@ class ToolDrilling(AppTool, Excellon):
|
||||
with self.app.proc_container.new(_("Generating CNC Code")):
|
||||
a_obj.app_obj.new_object("cncjob", job_name, job_init)
|
||||
|
||||
# Switch notebook to Selected page
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
|
||||
# Switch notebook to Properties page
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
|
||||
|
||||
# Create promise for the new name.
|
||||
self.app.collection.promise(job_name)
|
||||
|
||||
@@ -1619,8 +1619,8 @@ class ToolIsolation(AppTool, Gerber):
|
||||
if prog_plot == 'progressive':
|
||||
self.temp_shapes.clear(update=True)
|
||||
|
||||
# Switch notebook to Selected page
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
|
||||
# Switch notebook to Properties page
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
|
||||
|
||||
def combined_rest(self, iso_obj, iso2geo, tools_storage, lim_area, negative_dia=None, plot=True):
|
||||
"""
|
||||
@@ -3052,9 +3052,7 @@ class IsoUI:
|
||||
# ### 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)
|
||||
|
||||
|
||||
@@ -2501,8 +2501,8 @@ class NonCopperClear(AppTool, Gerber):
|
||||
else:
|
||||
a_obj.proc_container.view.set_idle()
|
||||
|
||||
# focus on Selected Tab
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
|
||||
# focus on Properties Tab
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
|
||||
|
||||
if run_threaded:
|
||||
# Promise object with the new name
|
||||
@@ -3487,8 +3487,8 @@ class NonCopperClear(AppTool, Gerber):
|
||||
else:
|
||||
app_obj.proc_container.view.set_idle()
|
||||
|
||||
# focus on Selected Tab
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
|
||||
# focus on Properties Tab
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
|
||||
|
||||
if run_threaded:
|
||||
# Promise object with the new name
|
||||
|
||||
@@ -2175,8 +2175,8 @@ class ToolPaint(AppTool, Gerber):
|
||||
self.app.inform.emit('[ERROR] %s' % _("Paint failed."))
|
||||
return
|
||||
|
||||
# focus on Selected Tab
|
||||
# self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
|
||||
# focus on Properties Tab
|
||||
# self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
|
||||
|
||||
self.app.inform.emit('[success] %s' % _("Paint Done."))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user