diff --git a/CHANGELOG.md b/CHANGELOG.md index de0d1004..85e3839e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ CHANGELOG for FlatCAM beta - updated the Calculators Tool such that now the Cut Z parameter for V-tip tool calculator can be calculated from the other parameters too - fixed a small issue in the Calculators Tool Cut Z default value; added a confirmation message for Electroplating calculator - fixed bug in opening PDF file from recent files list +- replaced some of the icons in the app 14.11.2020 diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index 01c69d7e..3825ceef 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -691,7 +691,7 @@ class MainGUI(QtWidgets.QMainWindow): '%s\t%s' % (_("Buffer Tool"), _('B')) ) self.geo_paint_menuitem = self.geo_editor_menu.addAction( - QtGui.QIcon(self.app.resource_location + '/paint16.png'), + QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), '%s\t%s' % (_("Paint Tool"), _('I')) ) self.geo_transform_menuitem = self.geo_editor_menu.addAction( @@ -1051,18 +1051,18 @@ class MainGUI(QtWidgets.QMainWindow): self.follow_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/follow32.png'), _("Follow Tool")) self.ncc_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool")) + QtGui.QIcon(self.app.resource_location + '/ncc32.png'), _("NCC Tool")) self.paint_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool")) self.toolbartools.addSeparator() self.cutout_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/cut16_bis.png'), _("Cutout Tool")) + QtGui.QIcon(self.app.resource_location + '/cut32.png'), _("Cutout Tool")) self.panelize_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/panelize32.png'), _("Panel Tool")) self.film_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/film16.png'), _("Film Tool")) + QtGui.QIcon(self.app.resource_location + '/film32.png'), _("Film Tool")) self.dblsided_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2-Sided Tool")) @@ -2234,18 +2234,18 @@ class MainGUI(QtWidgets.QMainWindow): self.follow_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/follow32.png'), _("Follow Tool")) self.ncc_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool")) + QtGui.QIcon(self.app.resource_location + '/ncc32.png'), _("NCC Tool")) self.paint_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool")) self.toolbartools.addSeparator() self.cutout_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/cut16_bis.png'), _("Cutout Tool")) + QtGui.QIcon(self.app.resource_location + '/cut32.png'), _("Cutout Tool")) self.panelize_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/panelize32.png'), _("Panel Tool")) self.film_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/film16.png'), _("Film Tool")) + QtGui.QIcon(self.app.resource_location + '/film32.png'), _("Film Tool")) self.dblsided_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2-Sided Tool")) diff --git a/appTools/ToolPunchGerber.py b/appTools/ToolPunchGerber.py index d5b4407a..810dec76 100644 --- a/appTools/ToolPunchGerber.py +++ b/appTools/ToolPunchGerber.py @@ -1680,7 +1680,7 @@ class PunchUI: self.sel_all_btn.setToolTip( _("Select all the pads available when in manual mode.") ) - self.clear_all_btn = FCButton(_("Clear All")) + self.clear_all_btn = FCButton(_("Deselect All")) self.clear_all_btn.setToolTip( _("Clear the selection of pads available when in manual mode.") ) diff --git a/app_Main.py b/app_Main.py index a9818c0e..f10a364d 100644 --- a/app_Main.py +++ b/app_Main.py @@ -1836,7 +1836,7 @@ class App(QtCore.QObject): self.panelize_tool.install(icon=QtGui.QIcon(self.resource_location + '/panelize16.png')) self.film_tool = Film(self) - self.film_tool.install(icon=QtGui.QIcon(self.resource_location + '/film16.png')) + self.film_tool.install(icon=QtGui.QIcon(self.resource_location + '/film32.png')) self.paste_tool = SolderPaste(self) self.paste_tool.install(icon=QtGui.QIcon(self.resource_location + '/solderpastebis32.png')) @@ -1861,15 +1861,15 @@ class App(QtCore.QObject): before=self.ui.menueditorigin, separator=True) self.cutout_tool = CutOut(self) - self.cutout_tool.install(icon=QtGui.QIcon(self.resource_location + '/cut16_bis.png'), pos=self.ui.menutool, + self.cutout_tool.install(icon=QtGui.QIcon(self.resource_location + '/cut32.png'), pos=self.ui.menutool, before=self.sub_tool.menuAction) self.ncclear_tool = NonCopperClear(self) - self.ncclear_tool.install(icon=QtGui.QIcon(self.resource_location + '/ncc16.png'), pos=self.ui.menutool, + self.ncclear_tool.install(icon=QtGui.QIcon(self.resource_location + '/ncc32.png'), pos=self.ui.menutool, before=self.sub_tool.menuAction, separator=True) self.paint_tool = ToolPaint(self) - 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 + '/paint20_1.png'), pos=self.ui.menutool, before=self.sub_tool.menuAction, separator=True) self.isolation_tool = ToolIsolation(self) diff --git a/assets/resources/cut16_bis.png b/assets/resources/cut16_bis.png deleted file mode 100644 index 390b3f9a..00000000 Binary files a/assets/resources/cut16_bis.png and /dev/null differ diff --git a/assets/resources/cut32.png b/assets/resources/cut32.png index 50f5aa0c..dc68ca93 100644 Binary files a/assets/resources/cut32.png and b/assets/resources/cut32.png differ diff --git a/assets/resources/cut32_bis.png b/assets/resources/cut32_bis.png deleted file mode 100644 index c6158109..00000000 Binary files a/assets/resources/cut32_bis.png and /dev/null differ diff --git a/assets/resources/dark_resources/cut32.png b/assets/resources/dark_resources/cut32.png index 80556310..ca9db1ec 100644 Binary files a/assets/resources/dark_resources/cut32.png and b/assets/resources/dark_resources/cut32.png differ diff --git a/assets/resources/dark_resources/film32.png b/assets/resources/dark_resources/film32.png index 0dab924a..cd16dec9 100644 Binary files a/assets/resources/dark_resources/film32.png and b/assets/resources/dark_resources/film32.png differ diff --git a/assets/resources/dark_resources/follow32.png b/assets/resources/dark_resources/follow32.png index f1340820..76bd29e7 100644 Binary files a/assets/resources/dark_resources/follow32.png and b/assets/resources/dark_resources/follow32.png differ diff --git a/assets/resources/dark_resources/ncc32.png b/assets/resources/dark_resources/ncc32.png new file mode 100644 index 00000000..5c83a927 Binary files /dev/null and b/assets/resources/dark_resources/ncc32.png differ diff --git a/assets/resources/film32.png b/assets/resources/film32.png index 18a6b72c..568a9da7 100644 Binary files a/assets/resources/film32.png and b/assets/resources/film32.png differ diff --git a/assets/resources/follow32.png b/assets/resources/follow32.png index f9170205..fdfe3195 100644 Binary files a/assets/resources/follow32.png and b/assets/resources/follow32.png differ diff --git a/assets/resources/ncc32.png b/assets/resources/ncc32.png new file mode 100644 index 00000000..de42b0b8 Binary files /dev/null and b/assets/resources/ncc32.png differ