- changed and added some icons
- fixed the Shortcuts Tab to reflect the actual current shortcut keys - started to work on moving the Isolation Routing from the Gerber Object UI to it's own tool
This commit is contained in:
parent
1a4fa4317a
commit
ee845e7571
|
@ -915,6 +915,8 @@ class MainGUI(QtWidgets.QMainWindow):
|
||||||
QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool"))
|
QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool"))
|
||||||
self.paint_btn = self.toolbartools.addAction(
|
self.paint_btn = self.toolbartools.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool"))
|
QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool"))
|
||||||
|
self.isolation_btn = self.toolbartools.addAction(
|
||||||
|
QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation Tool"))
|
||||||
self.toolbartools.addSeparator()
|
self.toolbartools.addSeparator()
|
||||||
|
|
||||||
self.panelize_btn = self.toolbartools.addAction(
|
self.panelize_btn = self.toolbartools.addAction(
|
||||||
|
@ -1908,6 +1910,8 @@ class MainGUI(QtWidgets.QMainWindow):
|
||||||
QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool"))
|
QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool"))
|
||||||
self.paint_btn = self.toolbartools.addAction(
|
self.paint_btn = self.toolbartools.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool"))
|
QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool"))
|
||||||
|
self.isolation_btn = self.toolbartools.addAction(
|
||||||
|
QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation Tool"))
|
||||||
self.toolbartools.addSeparator()
|
self.toolbartools.addSeparator()
|
||||||
|
|
||||||
self.panelize_btn = self.toolbartools.addAction(
|
self.panelize_btn = self.toolbartools.addAction(
|
||||||
|
@ -2295,14 +2299,15 @@ class MainGUI(QtWidgets.QMainWindow):
|
||||||
self.app.dblsidedtool.run(toggle=True)
|
self.app.dblsidedtool.run(toggle=True)
|
||||||
return
|
return
|
||||||
|
|
||||||
# Calibration Tool
|
# Extract Drills Tool
|
||||||
if key == QtCore.Qt.Key_E:
|
if key == QtCore.Qt.Key_E:
|
||||||
self.app.cal_exc_tool.run(toggle=True)
|
# self.app.cal_exc_tool.run(toggle=True)
|
||||||
|
self.app.edrills_tool.run(toggle=True)
|
||||||
return
|
return
|
||||||
|
|
||||||
# Copper Thieving Tool
|
# Fiducials Tool
|
||||||
if key == QtCore.Qt.Key_F:
|
if key == QtCore.Qt.Key_F:
|
||||||
self.app.copper_thieving_tool.run(toggle=True)
|
self.app.fiducial_tool.run(toggle=True)
|
||||||
return
|
return
|
||||||
|
|
||||||
# Toggle Grid lines
|
# Toggle Grid lines
|
||||||
|
@ -2310,17 +2315,17 @@ class MainGUI(QtWidgets.QMainWindow):
|
||||||
self.app.on_toggle_grid_lines()
|
self.app.on_toggle_grid_lines()
|
||||||
return
|
return
|
||||||
|
|
||||||
# Align in Object Tool
|
# Punch Gerber Tool
|
||||||
if key == QtCore.Qt.Key_H:
|
if key == QtCore.Qt.Key_H:
|
||||||
self.app.punch_tool.run(toggle=True)
|
self.app.punch_tool.run(toggle=True)
|
||||||
|
|
||||||
# Extract Drills Tool
|
# Isolation Tool
|
||||||
if key == QtCore.Qt.Key_I:
|
if key == QtCore.Qt.Key_I:
|
||||||
self.app.edrills_tool.run(toggle=True)
|
self.app.isolation_tool.run(toggle=True)
|
||||||
|
|
||||||
# Fiducials Tool
|
# Copper Thieving Tool
|
||||||
if key == QtCore.Qt.Key_J:
|
if key == QtCore.Qt.Key_J:
|
||||||
self.app.fiducial_tool.run(toggle=True)
|
self.app.copper_thieving_tool.run(toggle=True)
|
||||||
return
|
return
|
||||||
|
|
||||||
# Solder Paste Dispensing Tool
|
# Solder Paste Dispensing Tool
|
||||||
|
@ -3879,6 +3884,16 @@ class ShortcutsTab(QtWidgets.QWidget):
|
||||||
<td height="20"><strong>Alt+E</strong></td>
|
<td height="20"><strong>Alt+E</strong></td>
|
||||||
<td> %s</td>
|
<td> %s</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
</tr>
|
||||||
|
<tr height="20">
|
||||||
|
<td height="20"><strong>Alt+F</strong></td>
|
||||||
|
<td> %s</td>
|
||||||
|
</tr>
|
||||||
|
</tr>
|
||||||
|
<tr height="20">
|
||||||
|
<td height="20"><strong>Alt+G</strong></td>
|
||||||
|
<td> %s</td>
|
||||||
|
</tr>
|
||||||
<tr height="20">
|
<tr height="20">
|
||||||
<td height="20"><strong>Alt+H</strong></td>
|
<td height="20"><strong>Alt+H</strong></td>
|
||||||
<td> %s</td>
|
<td> %s</td>
|
||||||
|
@ -3928,7 +3943,19 @@ class ShortcutsTab(QtWidgets.QWidget):
|
||||||
<td> %s</td>
|
<td> %s</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr height="20">
|
<tr height="20">
|
||||||
<td height="20"><strong>Alt+U</strong></td>
|
<td height="20"><strong>Alt+T</strong></td>
|
||||||
|
<td> %s</td>
|
||||||
|
</tr>
|
||||||
|
<tr height="20">
|
||||||
|
<td height="20"><strong>Alt+W</strong></td>
|
||||||
|
<td> %s</td>
|
||||||
|
</tr>
|
||||||
|
<tr height="20">
|
||||||
|
<td height="20"><strong>Alt+X</strong></td>
|
||||||
|
<td> %s</td>
|
||||||
|
</tr>
|
||||||
|
<tr height="20">
|
||||||
|
<td height="20"><strong>Alt+Z</strong></td>
|
||||||
<td> %s</td>
|
<td> %s</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr height="20">
|
<tr height="20">
|
||||||
|
@ -4030,13 +4057,15 @@ class ShortcutsTab(QtWidgets.QWidget):
|
||||||
_("Skew on Y axis"),
|
_("Skew on Y axis"),
|
||||||
|
|
||||||
# ALT section
|
# ALT section
|
||||||
_("Align Objects Tool"), _("Calculators Tool"), _("2-Sided PCB Tool"), _("Transformations Tool"),
|
_("Align Objects Tool"), _("Calculators Tool"), _("2-Sided PCB Tool"), _("Extract Drills Tool"),
|
||||||
_("Punch Gerber Tool"), _("Extract Drills Tool"), _("Fiducials Tool"),
|
_("Fiducials Tool"), _("Toggle Grid Lines"),
|
||||||
|
_("Punch Gerber Tool"), _("Isolation Tool"), _("Copper Thieving Tool"),
|
||||||
_("Solder Paste Dispensing Tool"),
|
_("Solder Paste Dispensing Tool"),
|
||||||
_("Film PCB Tool"), _("Corner Markers Tool"), _("Non-Copper Clearing Tool"), _("Optimal Tool"),
|
_("Film PCB Tool"), _("Corner Markers Tool"), _("Non-Copper Clearing Tool"), _("Optimal Tool"),
|
||||||
_("Paint Area Tool"), _("QRCode Tool"), _("Rules Check Tool"),
|
_("Paint Area Tool"), _("QRCode Tool"), _("Rules Check Tool"),
|
||||||
_("View File Source"),
|
_("View File Source"), _("Transformations Tool"),
|
||||||
_("Cutout PCB Tool"), _("Enable all Plots"), _("Disable all Plots"), _("Disable Non-selected Plots"),
|
_("Subtract Tool"), _("Cutout PCB Tool"), _("Panelize PCB"),
|
||||||
|
_("Enable all Plots"), _("Disable all Plots"), _("Disable Non-selected Plots"),
|
||||||
_("Toggle Full Screen"),
|
_("Toggle Full Screen"),
|
||||||
|
|
||||||
# CTRL + ALT section
|
# CTRL + ALT section
|
||||||
|
|
|
@ -568,7 +568,7 @@ class ToolCopperThieving(AppTool):
|
||||||
self.app.ui.notebook.setTabText(2, _("Copper Thieving Tool"))
|
self.app.ui.notebook.setTabText(2, _("Copper Thieving Tool"))
|
||||||
|
|
||||||
def install(self, icon=None, separator=None, **kwargs):
|
def install(self, icon=None, separator=None, **kwargs):
|
||||||
AppTool.install(self, icon, separator, shortcut='Alt+F', **kwargs)
|
AppTool.install(self, icon, separator, shortcut='Alt+J', **kwargs)
|
||||||
|
|
||||||
def set_tool_ui(self):
|
def set_tool_ui(self):
|
||||||
self.units = self.app.defaults['units']
|
self.units = self.app.defaults['units']
|
||||||
|
|
|
@ -396,7 +396,7 @@ class ToolFiducials(AppTool):
|
||||||
self.app.ui.notebook.setTabText(2, _("Fiducials Tool"))
|
self.app.ui.notebook.setTabText(2, _("Fiducials Tool"))
|
||||||
|
|
||||||
def install(self, icon=None, separator=None, **kwargs):
|
def install(self, icon=None, separator=None, **kwargs):
|
||||||
AppTool.install(self, icon, separator, shortcut='Alt+J', **kwargs)
|
AppTool.install(self, icon, separator, shortcut='Alt+F', **kwargs)
|
||||||
|
|
||||||
def set_tool_ui(self):
|
def set_tool_ui(self):
|
||||||
self.units = self.app.defaults['units']
|
self.units = self.app.defaults['units']
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,7 +1,6 @@
|
||||||
|
|
||||||
from AppTools.ToolCalculators import ToolCalculator
|
from AppTools.ToolCalculators import ToolCalculator
|
||||||
from AppTools.ToolCalibration import ToolCalibration
|
from AppTools.ToolCalibration import ToolCalibration
|
||||||
from AppTools.ToolCutOut import CutOut
|
|
||||||
|
|
||||||
from AppTools.ToolDblSided import DblSidedTool
|
from AppTools.ToolDblSided import DblSidedTool
|
||||||
from AppTools.ToolExtractDrills import ToolExtractDrills
|
from AppTools.ToolExtractDrills import ToolExtractDrills
|
||||||
|
@ -16,8 +15,10 @@ from AppTools.ToolDistanceMin import DistanceMin
|
||||||
|
|
||||||
from AppTools.ToolMove import ToolMove
|
from AppTools.ToolMove import ToolMove
|
||||||
|
|
||||||
|
from AppTools.ToolCutOut import CutOut
|
||||||
from AppTools.ToolNCC import NonCopperClear
|
from AppTools.ToolNCC import NonCopperClear
|
||||||
from AppTools.ToolPaint import ToolPaint
|
from AppTools.ToolPaint import ToolPaint
|
||||||
|
from AppTools.ToolIsolation import ToolIsolation
|
||||||
|
|
||||||
from AppTools.ToolOptimal import ToolOptimal
|
from AppTools.ToolOptimal import ToolOptimal
|
||||||
|
|
||||||
|
|
10
App_Main.py
10
App_Main.py
|
@ -1315,10 +1315,13 @@ class App(QtCore.QObject):
|
||||||
self.rules_tool = None
|
self.rules_tool = None
|
||||||
self.sub_tool = None
|
self.sub_tool = None
|
||||||
self.move_tool = None
|
self.move_tool = None
|
||||||
|
|
||||||
self.cutout_tool = None
|
self.cutout_tool = None
|
||||||
self.ncclear_tool = None
|
self.ncclear_tool = None
|
||||||
self.optimal_tool = None
|
|
||||||
self.paint_tool = None
|
self.paint_tool = None
|
||||||
|
self.isolation_tool = None
|
||||||
|
|
||||||
|
self.optimal_tool = None
|
||||||
self.transform_tool = None
|
self.transform_tool = None
|
||||||
self.properties_tool = None
|
self.properties_tool = None
|
||||||
self.pdf_tool = None
|
self.pdf_tool = None
|
||||||
|
@ -1901,6 +1904,10 @@ class App(QtCore.QObject):
|
||||||
self.paint_tool.install(icon=QtGui.QIcon(self.resource_location + '/paint16.png'), pos=self.ui.menutool,
|
self.paint_tool.install(icon=QtGui.QIcon(self.resource_location + '/paint16.png'), pos=self.ui.menutool,
|
||||||
before=self.sub_tool.menuAction, separator=True)
|
before=self.sub_tool.menuAction, separator=True)
|
||||||
|
|
||||||
|
self.isolation_tool = ToolIsolation(self)
|
||||||
|
self.isolation_tool.install(icon=QtGui.QIcon(self.resource_location + '/iso_16.png'), pos=self.ui.menutool,
|
||||||
|
before=self.sub_tool.menuAction, separator=True)
|
||||||
|
|
||||||
self.copper_thieving_tool = ToolCopperThieving(self)
|
self.copper_thieving_tool = ToolCopperThieving(self)
|
||||||
self.copper_thieving_tool.install(icon=QtGui.QIcon(self.resource_location + '/copperfill32.png'),
|
self.copper_thieving_tool.install(icon=QtGui.QIcon(self.resource_location + '/copperfill32.png'),
|
||||||
pos=self.ui.menutool)
|
pos=self.ui.menutool)
|
||||||
|
@ -2057,6 +2064,7 @@ class App(QtCore.QObject):
|
||||||
self.ui.cutout_btn.triggered.connect(lambda: self.cutout_tool.run(toggle=True))
|
self.ui.cutout_btn.triggered.connect(lambda: self.cutout_tool.run(toggle=True))
|
||||||
self.ui.ncc_btn.triggered.connect(lambda: self.ncclear_tool.run(toggle=True))
|
self.ui.ncc_btn.triggered.connect(lambda: self.ncclear_tool.run(toggle=True))
|
||||||
self.ui.paint_btn.triggered.connect(lambda: self.paint_tool.run(toggle=True))
|
self.ui.paint_btn.triggered.connect(lambda: self.paint_tool.run(toggle=True))
|
||||||
|
self.ui.isolation_btn.triggered.connect(lambda: self.isolation_tool.run(toggle=True))
|
||||||
|
|
||||||
self.ui.panelize_btn.triggered.connect(lambda: self.panelize_tool.run(toggle=True))
|
self.ui.panelize_btn.triggered.connect(lambda: self.panelize_tool.run(toggle=True))
|
||||||
self.ui.film_btn.triggered.connect(lambda: self.film_tool.run(toggle=True))
|
self.ui.film_btn.triggered.connect(lambda: self.film_tool.run(toggle=True))
|
||||||
|
|
|
@ -13,6 +13,9 @@ CHANGELOG for FlatCAM beta
|
||||||
- modified the Etch Compensation Tool and added conversion utilities from Oz thickenss and mils to microns
|
- modified the Etch Compensation Tool and added conversion utilities from Oz thickenss and mils to microns
|
||||||
- added a Toggle All checkbox to Corner Markers Tool
|
- added a Toggle All checkbox to Corner Markers Tool
|
||||||
- added an Icon to the MessageBox that asks for saving if the user try to close the app and there is some unsaved work
|
- added an Icon to the MessageBox that asks for saving if the user try to close the app and there is some unsaved work
|
||||||
|
- changed and added some icons
|
||||||
|
- fixed the Shortcuts Tab to reflect the actual current shortcut keys
|
||||||
|
- started to work on moving the Isolation Routing from the Gerber Object UI to it's own tool
|
||||||
|
|
||||||
24.05.2020
|
24.05.2020
|
||||||
|
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 156 B |
Binary file not shown.
Before Width: | Height: | Size: 554 B After Width: | Height: | Size: 425 B |
Binary file not shown.
After Width: | Height: | Size: 156 B |
Binary file not shown.
Before Width: | Height: | Size: 553 B After Width: | Height: | Size: 420 B |
Loading…
Reference in New Issue