diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 0cbab671..a808c2da 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -1760,11 +1760,11 @@ class App(QtCore.QObject): before=self.ui.menueditorigin) self.cutout_tool = CutOut(self) - self.cutout_tool.install(icon=QtGui.QIcon('share/cut16.png'), pos=self.ui.menutool, + self.cutout_tool.install(icon=QtGui.QIcon('share/cut16_bis.png'), pos=self.ui.menutool, before=self.measurement_tool.menuAction) self.ncclear_tool = NonCopperClear(self) - self.ncclear_tool.install(icon=QtGui.QIcon('share/flatcam_icon16.png'), pos=self.ui.menutool, + self.ncclear_tool.install(icon=QtGui.QIcon('share/ncc16.png'), pos=self.ui.menutool, before=self.measurement_tool.menuAction, separator=True) self.paint_tool = ToolPaint(self) diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py index f9702edd..fa0c351b 100644 --- a/FlatCAMGUI.py +++ b/FlatCAMGUI.py @@ -63,11 +63,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.menufilenew = self.menufile.addMenu(QtGui.QIcon('share/file16.png'), _('&New')) self.menufilenew.setToolTipsVisible(True) - self.menufilenewgeo = self.menufilenew.addAction(QtGui.QIcon('share/new_geo16.png'), _('&New Geometry\tN')) + self.menufilenewgeo = self.menufilenew.addAction(QtGui.QIcon('share/geometry16.png'), _('Geometry\tN')) self.menufilenewgeo.setToolTip( _("Will create a new, empty Geometry Object.") ) - self.menufilenewexc = self.menufilenew.addAction(QtGui.QIcon('share/new_geo16.png'), _('New Excellon\tL')) + self.menufilenewexc = self.menufilenew.addAction(QtGui.QIcon('share/drill16.png'), _('Excellon\tL')) self.menufilenewexc.setToolTip( _("Will create a new, empty Excellon Object.") ) @@ -566,8 +566,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow): ### Tools Toolbar ### self.dblsided_btn = self.toolbartools.addAction(QtGui.QIcon('share/doubleside32.png'), _("2Sided Tool")) - self.cutout_btn = self.toolbartools.addAction(QtGui.QIcon('share/cut16.png'), _("&Cutout Tool")) - self.ncc_btn = self.toolbartools.addAction(QtGui.QIcon('share/flatcam_icon32.png'), _("NCC Tool")) + self.cutout_btn = self.toolbartools.addAction(QtGui.QIcon('share/cut16_bis.png'), _("&Cutout Tool")) + self.ncc_btn = self.toolbartools.addAction(QtGui.QIcon('share/ncc16.png'), _("NCC Tool")) self.paint_btn = self.toolbartools.addAction(QtGui.QIcon('share/paint20_1.png'), _("Paint Tool")) self.toolbartools.addSeparator() @@ -1615,8 +1615,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow): ### Tools Toolbar ### self.dblsided_btn = self.toolbartools.addAction(QtGui.QIcon('share/doubleside32.png'), _("2Sided Tool")) - self.cutout_btn = self.toolbartools.addAction(QtGui.QIcon('share/cut16.png'), _("&Cutout Tool")) - self.ncc_btn = self.toolbartools.addAction(QtGui.QIcon('share/flatcam_icon32.png'), _("NCC Tool")) + self.cutout_btn = self.toolbartools.addAction(QtGui.QIcon('share/cut16_bis.png'), _("&Cutout Tool")) + self.ncc_btn = self.toolbartools.addAction(QtGui.QIcon('share/ncc16.png'), _("NCC Tool")) self.paint_btn = self.toolbartools.addAction(QtGui.QIcon('share/paint20_1.png'), _("Paint Tool")) self.toolbartools.addSeparator() diff --git a/FlatCAMTranslation.py b/FlatCAMTranslation.py index 8f1fdcb9..6c274214 100644 --- a/FlatCAMTranslation.py +++ b/FlatCAMTranslation.py @@ -72,7 +72,7 @@ def on_language_apply_click(app, restart=False): msgbox.setText("The application will restart.") msgbox.setInformativeText("Are you sure do you want to change the current language to %s?" % name.capitalize()) msgbox.setWindowTitle("Apply Language ...") - msgbox.setWindowIcon(QtGui.QIcon('share/save_as.png')) + msgbox.setWindowIcon(QtGui.QIcon('share/language32.png')) msgbox.setStandardButtons(QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.Cancel) msgbox.setDefaultButton(QtWidgets.QMessageBox.Yes) diff --git a/README.md b/README.md index c7113ec8..f26ae0f5 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ CAD program, and create G-Code for Isolation routing. ================================================= +11.03.2019 + +- changed some icons here and there + + 10.03.2019 - added a fix in the Gerber parser when adding the geometry in the self.apertures dict for the case that the current aperture is None (Allegro does that) diff --git a/share/cut16_bis.png b/share/cut16_bis.png new file mode 100644 index 00000000..832a03da Binary files /dev/null and b/share/cut16_bis.png differ diff --git a/share/cut32_bis.png b/share/cut32_bis.png new file mode 100644 index 00000000..880acbaa Binary files /dev/null and b/share/cut32_bis.png differ diff --git a/share/language32.png b/share/language32.png new file mode 100644 index 00000000..05fecccb Binary files /dev/null and b/share/language32.png differ diff --git a/share/ncc16.png b/share/ncc16.png new file mode 100644 index 00000000..f2cf1ebf Binary files /dev/null and b/share/ncc16.png differ