From 91549587e26879ef2eb3de61f91de2b8661c5c8f Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 11 Mar 2019 02:08:29 +0200 Subject: [PATCH] - changed some icons here and there --- FlatCAMApp.py | 4 ++-- FlatCAMGUI.py | 12 ++++++------ FlatCAMTranslation.py | 2 +- README.md | 5 +++++ share/cut16_bis.png | Bin 0 -> 414 bytes share/cut32_bis.png | Bin 0 -> 1036 bytes share/language32.png | Bin 0 -> 415 bytes share/ncc16.png | Bin 0 -> 287 bytes 8 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 share/cut16_bis.png create mode 100644 share/cut32_bis.png create mode 100644 share/language32.png create mode 100644 share/ncc16.png 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 0000000000000000000000000000000000000000..832a03da09feb6fe16b12caf7b3b966237391172 GIT binary patch literal 414 zcmV;P0b%}$P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0W(QNK~y+Tz0*r8 z1pyew@sX4il7xjMVIwOgHnNh1y9EmiB^wKrQVIzhxhwZex!=X7kWc0RpJqlaG0Nc329d;1BVjs&` z!ab6u1#f6TJ>JoXU}xZ<{907*qo IM6N<$f~ml*kN^Mx literal 0 HcmV?d00001 diff --git a/share/cut32_bis.png b/share/cut32_bis.png new file mode 100644 index 0000000000000000000000000000000000000000..880acbaa334a60bd93baea30e0fa519ce2aefc6f GIT binary patch literal 1036 zcmV+n1oQieP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1EEPoK~z{r?bmt8 z%~=@0@k{oxFAb43S*J*e;SXfXntk6&jmQ+EMr7Y*k0QIQWhqJagv{8YDQm+FF~+{{ z>-T%zqu2Jj?{#1K!&9GhfA0PL&hMP(JkNO}-%?b=RBXg53_t;Vl^Bf|*o~Q3fb+P5 zpOLQ77SGTW`D6e7gv?lo8z_Wig!eCvOwmuV*o(y|h0Az|SD23M_zxqHXyibD9EbPS zUCcv4MDCy+Cg1=ZT|M~4GMI*~NF-|EEdIwB)J9oMg7;s7$ThUbQ2c|uaAbbL#GH$r zNK5zE`dqX8-0)mCZV&E5Aj4t_+SU%Ktfc(DY&y-mJgx{%!M=f6+YZpgqv_cZ%6!* z$c6BBCTz+q?}ta&fK=;>TWvf{nERLk6UN+dhK`^H-jC||8_rb9n&I-fw2$E~$bh)Q z{ofTw;g%c-r*kb{!ew!=&WLOI6e|&C&2XUq!WpgVg+#&;_kv5a3qGI$PU030!T;-q z5dP+OIH=`tX}<P!^FtVNo%&E!%&j$uU$$Xk-p93@GX0`nwG4qo3YHG3-{1tD6(8QPEHUWg~WVP81a-gE_gWB0kU;4Wx`_oD@DU^cIE zUWkPc_N-x!wDLk~Q4>DEQJYXxAV!b-WM@^T>O8@9tg*;mEq+H+T>!3fIq~V;}c~oYo`R5Ab(Ry&X2}24~6c zYTLGbM`zYn+ZtxMg~hOgIRLZW^P5{Qk+5EPo^Tm|foDu-dKkR_d_;?h31V4wdOSp$ zc>ZzX$o=e|PBdIbU%~|Up>k$6A==E$S|8|6C;>;>7*3ZzG_&L0%c+DfPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0W?WOK~z{r?US)e z15pq~R}rgN*xIDgpGYO767ms(RUnn6;4j#TA0gQL4*?r((%4xENGQ{)a!QrPtjHgEyelk7zt!#32g zeON_zgxJ6%R8O+!aSFNrUjE)e`>)X*AvTa&i(PmEwNJ0$9;_0b{~;L&&^h{Q)>XXT z6v;rq8yvy`+=hqn7LH++r42AI>ob6-IDq%i%gk$t7nY<4U!b?Yhzp@Z=kTMfuVD*j zK?6_@a0WMEHuP}5`Xe@S!-qe>{mE(t+`yghay4ZA-VK>4iZ3rY@QV%kxZnT)002ov JPDHLkV1kwZupIyZ literal 0 HcmV?d00001 diff --git a/share/ncc16.png b/share/ncc16.png new file mode 100644 index 0000000000000000000000000000000000000000..f2cf1ebf38d8843d1f5616516f9e1f67bac2f93f GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!7ZLHjv*HQYbP3V9Wsz`3zmtAxpU{p-g^hK zIr8|bnA8uRRsOQTBeb`pf1j=ZueTFJI=^q?>jA z@9wT2*$FEhnSvJ_wA_}+bwYjJ2l3zs59jOON$Ansa4dSuz2pNT7j%0*N}bixxgaB; zyeDCXe8KbkzKn)PjN9^m8EPxARUG@L@Iw@l>m31C