From bdf2192d0088309bec79829218cdcc04b3ef62d5 Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Sat, 2 May 2020 00:09:48 +0300
Subject: [PATCH] - changed the icons for the grid snap in the status bar -
 moved some of the methods from FlatCAMApp.App to flatcamGUI.FlatCAMGUI class

---
 CHANGELOG.md                                  |   5 +++
 FlatCAMApp.py                                 |  29 +-----------------
 .../dark_resources/flatcam_icon32_green.png   | Bin 994 -> 553 bytes
 assets/resources/dark_resources/snap_16.png   | Bin 557 -> 549 bytes
 .../dark_resources/snap_filled_16.png         | Bin 337 -> 381 bytes
 assets/resources/snap_16.png                  | Bin 426 -> 586 bytes
 assets/resources/snap_filled_16.png           | Bin 176 -> 381 bytes
 flatcamGUI/FlatCAMGUI.py                      |  29 ++++++++++++++++--
 8 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21767916..6130baae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+2.05.2020
+
+- changed the icons for the grid snap in the status bar
+- moved some of the methods from FlatCAMApp.App to flatcamGUI.FlatCAMGUI class
+
 01.05.2020
 
 - added some ToolTips (strings needed to be translated too) for the Cut Z entry in Geometry Object UI that explain why is sometime disabled and reason for it's value (sometime is zero)
diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 7bc26d3e..6ba19076 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -506,7 +506,6 @@ class App(QtCore.QObject):
         QtCore.QObject.__init__(self)
 
         self.ui = FlatCAMGUI(self)
-        self.on_grid_snap_triggered(state=True)
 
         theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
         if theme_settings.contains("theme"):
@@ -1074,9 +1073,6 @@ class App(QtCore.QObject):
         # signal emitted when a tab is closed in the Plot Area
         self.ui.plot_tab_area.tab_closed_signal.connect(self.on_plot_area_tab_closed)
 
-        self.ui.grid_snap_btn.triggered.connect(self.on_grid_snap_triggered)
-        self.ui.snap_infobar_label.clicked.connect(self.on_grid_icon_snap_clicked)
-
         # signal to close the application
         self.close_app_signal.connect(self.kill_app)
         # ################################# FINISHED CONNECTING SIGNALS #############################################
@@ -4634,7 +4630,7 @@ class App(QtCore.QObject):
         self.defaults.report_usage("on_toggle_grid()")
 
         self.ui.grid_snap_btn.trigger()
-        self.on_grid_snap_triggered(state=True)
+        self.ui.on_grid_snap_triggered(state=True)
 
     def on_toggle_grid_lines(self):
         self.defaults.report_usage("on_toggle_grd_lines()")
@@ -10622,29 +10618,6 @@ class App(QtCore.QObject):
                 update_colors=(new_color, new_line_color)
             )
 
-    def on_grid_snap_triggered(self, state):
-        """
-
-        :param state:   A parameter with the state of the grid, boolean
-
-        :return:
-        """
-        if state:
-            self.ui.snap_infobar_label.setPixmap(QtGui.QPixmap(self.resource_location + '/snap_filled_16.png'))
-        else:
-            self.ui.snap_infobar_label.setPixmap(QtGui.QPixmap(self.resource_location + '/snap_16.png'))
-
-        self.ui.snap_infobar_label.clicked_state = state
-
-    def on_grid_icon_snap_clicked(self):
-        """
-        Slot called by clicking a GUI element, in this case a FCLabel
-
-        :return:
-        """
-        if isinstance(self.sender(), FCLabel):
-            self.ui.grid_snap_btn.trigger()
-
     def generate_cnc_job(self, objects):
         """
         Slot that will be called by clicking an entry in the contextual menu generated in the Project Tab tree
diff --git a/assets/resources/dark_resources/flatcam_icon32_green.png b/assets/resources/dark_resources/flatcam_icon32_green.png
index e52b756ac1862d98fcf11ffa32adf926345ba04f..ad778285aa849389838bea2e85ed3a3b110f4ee2 100644
GIT binary patch
delta 539
zcmV+$0_6ST2dM;*8Gi-<004gzuhRek00DDSM?wMF$t-^W000SaNLh0L06l~N06l~O
z)vT{{0005bNkl<Zc%1E(xl02<6o+>`5)wt%h(U6=IZy;UMH>+d!BQ+dItBj&5y46X
zdquD|Hm0yK5fP#>F)ApipslwkVxidBX4l_aCNQoh<d`xGAAd9ZX6Ai)yO~)@5_koV
zf{s8c5CS?QjF?lT!?=+6odoVZx8{nuG$#AX_Ny!yTmosJ6#ymG98rfRg(L%IOUc9+
z|C1bWr5A+%(63p;Rvi)p%Z5ewC4DruZI-NY3r|1<MDu{=C1{-zQ8am7)(Nhnxs1eS
zsw9qBMG@~PNq_6TajyZ(b<R&1&OBq16e{4Jij7tH!q`Eqh8ImS(K7}biWM=L3>q2o
zuR%_9hr#+%L^-dri2jjmQy+s#AtJ;&Kp#ghnDOj;XrJh6Ql)i6C5dp~55E7L04cwY
z6Ch2y-?{6gSgdFflThppjDZm_%G!Axn!0_{uB!>7qJQzCM4%4+d+>z5YMxK~17ibV
z8ua8P$s$tFe*~xKSLL0k1koA#)n!pG(F7CSGEpu159}RP3XvdD6MX@h=mYo7XcxdI
zcm;z(L`c-leT%4VGi}gSQKC*hF)C^`iI&TvY@#kxV)Hv%5hZE|H{b$XqM{bG*X;fZ
d%!=^*02GLH=!Cm;#7_VK002ovPDHLkV1lL3<>&wa

literal 994
zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)j!3-ol&c;6kQY`6?zK#qG8~eHcB(ehe3dtTp
zz6=aiY77hwEes65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;hJk@GKENl$^*<2k{r{)?
z4~QU)uPR@^D1U)-AyO|TUS4Fl_)PQ}g!@<LFNA?iJ{Nlq<U$OAn+aC{7XdOL2(B2e
z290rx^A?&2go|txTmhOOCKn<C7l&(vGjK_vi342)42qi^H~(n=xy*F=yW00}s^5Si
z^IP-xKb?Q?<=%f*`uu?J!7t5Uz@S~g#dH7|2dO1Ne!&bv^OuRe`1kKUTi@S*K+wGR
z-==v-Hf-GYuYz+A)Be)|kGF6qJrraVzQcbwUfb5X*w6mU-<{9GLPG1p`R+cDcP=y&
zxPP4G1Z&)Fo_oxqZzLMtK5;Wun_{HeZ#+@s)|s<%7cZ1%n#u+PEo4mcc6VXuV3qX%
zaySb-B8wRqY=H^FwuSNPn)M|>LG}_)Usv`gEWDxu!jr1@+X97tdAc};Xq-<@IKa~5
zvvTDb9iAHu*;>-oTI?-nPaZwn%&^jCPfg9Al}rhe2SY>@rc9eRZ=xp8BtcJKQBmP`
zM#IjKlWTPTg=n&|WiF7Dj7-`6Bxv*I;HQl|ts!!fA?Y67+FDwg%#vCwS7l}Rg<QW7
zkj~(pnPr&3KE?ZFQReFeua~c0zI-YD<jFJ1Mc$H<&4(24tL!}>;(JQt>X|!-E*)C6
zVZ{xp&{M~*os)Z`$nLIgvU^T!%-w<=7j7QC+ng0NZ)IH6J-c=LW*F5STKSK$(ea?-
zjG%=pZB`~a+;2<va%E^$ZnWr%3cBc!I3d<>M$pE>kDQ&JA5UsZ7%{xq<8dKrmIyFg
zFsPQeMwFx^mZVxG7o`Fz1|tI_16>0XT|<))0|P5VGb=+&T?1n)1B2(fUT;w}<mRVj
Yrd8tBFs<NIAW#E?r>mdKI;Vst0HLhsPyhe`

diff --git a/assets/resources/dark_resources/snap_16.png b/assets/resources/dark_resources/snap_16.png
index c8666a1a9039807ed5555eefbdae52553b2c7a23..cab1ab036edc39aee282580b2e67bd77d13eb097 100644
GIT binary patch
literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq000XB000gM1^@s6`C;aj00004b3#c}2nYxW
zd<bNS00009a7bBm000JC000JC0kS?LhX4Qo8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10isDnK~yM_ZIC~U6Hye!&%5u<PG%-yLJDWIY_o1F@y`d46|8lu
zd;x1&h*$)Y_#g?fuoT?F!Vj{wps=`&wSpEFf)IQ&Z~nb&GYKJh%EP&b-#r42X0zGT
zJkKwja|wWmnJXgtBc=T4`~C~9btM2`GMPLx#w@J0x3DKErR#J$SN(qfTxzZF7-QaN
zS$3$D%EK_c4uas?^Sqx@%CIPkPEi!M%d$+Awf1G2rbkMtJdWe#VzF3mTBp<Leb4jW
zm1TKKL^s6D#{l5_{*S?6@Ol?vKA(R{lH^eoMQ6+9@=`hHx&S~#>2Nr#_nAkdQ3l{E
z01$u(0GK)75AI7bvj6}g1aC~OHDy_LRoC^Q5aIwp;dx%E0Ax)j*eMB}bEn3b<Bid7
zx4#n+WdPuu3$@nNH2-b2TCcj@?%OzyKW`3*nJoYmMR8PB)svkiKCD)&3nKcoWmZak
zBcg|8Sq9eHH{<d6TnO=7O8JYKqq?piY{R`?@40jC-g>>hYm7MoaMDZ(W(M>2Z-|ER
nahj%=%zW^_$((bw@B8i_v^2Mq<{c$300000NkvXXu0mjf3W@TY

literal 557
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{Xiaj
ziKnkC`x6#kQ31)K^<l~k42-6pE{-7@=Tj%{^>#`WIaYsa?}M!!3WiMG3nnaJTfRUk
zLp!s7ff7eomH~&9l#$e;t32Wh6*Yvm%lu|Obn@&kW~n9m9T#M_%xn7{XIypu!#w?Y
z#q*y3aJk(rq<TPERVwb(^{kG~elv}H+d2bP&YCk6=`K{h=_Jd=y-+pvZWrqTk-u*Y
zPZ*kJ@l1H$#nJu5rX`#8>dGc3HvOfAtfj9NzkE2R&goZa`dengLO<TwY)+e_1b0n{
z|6|V0@tNhv*=x7YY{^)@V{=qv@;^?o9`my^ZhvsnSJ0W|Fx4g?k$raCX{9B`3w@8?
zPK)Q#&Gu_c^JBEsT5*1g`4+8`b$R|Pc-r4=KFS$iBe2k8THvca|GoCEUXr7DyhHSI
z@2-|xeWvH7`0oU(9#T24vhv?vwF3gm79kpe--GN=DK67w%XG8`hN)_aYeY#(Vo9o1
za#1RfVlXl=GSD?J(KR#)F)*+)G_x`?)ip4-GB8-jq+W%hAvZrIGp!Q0hWqjJj{!9>
Nc)I$ztaD0e0s#FS$Nm5S

diff --git a/assets/resources/dark_resources/snap_filled_16.png b/assets/resources/dark_resources/snap_filled_16.png
index 229c91fe1fa716320352acd1d6449403a3ef799f..2e54503eef1f9393235f3caacce7c3e785db0336 100644
GIT binary patch
literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^AT}Qd8;}%R+`Ae`u@pObhHwBu4M$1`kk47*5n0T@
zz!nX{jGOF~+kt|TC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6f7@^o<w
z(U@3!e!upSLYd<qk3X-z@6kD#mDyVI%F-SmvDA%HXNppH@$CBjOsu}y=uVP@(#bSa
zt$!@tyNa$)o$`C$)9RSIJJnU+-~FuH7yo`ibZ72LrDcMTMa|hn-mYxt(ee!a8_OSY
z(o@Itsz8BukmyQJTW+oyPIlL}sdkjiS$*S$VXVg-FWJW`VrQD?ypDJOem7Zck&mzY
z<M}<i9#mZ0{;Sc@>ZaH8>{&A|muX12bfxvEwM}?0sKXIfKQAvua{s}^^rq5@NoiM1
zCq*3*yz#Y7J0R>(N{_n8hLw*T&n*?yFWX~n@c6I>OR8|ik%;~4i{EY0S)IIA{s-p_
XAL}<w(S?P;P+;(M^>bP0l+XkKbR(E~

literal 337
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8U)v6XN<G2(m%Msxv8i
zKtaZmAirP+hi5m^K%69RcNeBK?wS-JhrPtp*OmPV3$G}@d9re75m3m&)5S4_<GOFp
zLPiDyj>An4SpGd^Vfp)is$p7M(j>7xjGBfkKe$#3rusfP;qkR!TkWOz`yBpvR~g@S
z^Gr+LAUhXmhH8mxL`h0wNvc(HQ7VvPFfuSQ&^0j8H8cq^Ft9Q-wK6r;H88d^F!28{
gH33CKZhlH;S|x4`c58L-05vdpy85}Sb4q9e0BI9rR{#J2

diff --git a/assets/resources/snap_16.png b/assets/resources/snap_16.png
index 25bf01ddd00d86c5d76f847166a9dcf80ad5ce97..f0bf21123f684039ffcc98b2f5c56e7d2f185635 100644
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq000XB000gM1^@s6`C;aj00004b3#c}2nYxW
zd<bNS00009a7bBm000JC000JC0kS?LhX4Qo8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10mn&1K~yM_ZIHi<+5jBIU!q1#6pCPS90i9$6dKWV$fynnZmmu#
zxD}-0a7f1vot$(Krw$$3Kfp2E(&BI?wp$m)N}wkWJ!tV~xir5!+#T4~4}9Uv<MHMD
z9)UYjsnoM%GI`FjEJqLoV_BB%IL>-HovNy;z64+c07OxI-tYInYntZ#JLB=#%IEVJ
z0D=U^aYCcfxTw`?r?c727z_qqHk-{gP18&!lMza#(#d+g_FAphTjX-N_w)JOk!ATt
z5QJAaARdp4#bWVOx7+<8Nzw~ctJRO1ra8@K^D6)!{wEZTMjrzJ$uP_V05A;W27q(K
ztglw92>_53MKJ(i+qQAU_!oZ9^N73MJJ88Oq3|J*NSs)fMFj!@Q&AMlZ<?kK02D=q
z4$O2qoqklW*B{;suIpa;ZQIrXAQ%kN07w8XfM2pKzgAUMjKyM7r_+%DfHY0>HvnX_
z*;Ah9pWa`ZOeXI}qtW?dvH0wHw;%eK%jLKIexDUZF;uBkx{9I{ce~wBUDvMxFf7YH
zA&A>p1OTR7E?>6W?et;t?RE>F&xde03;^i$dRGJh@H~Ge2*MkV<EUemMIsSrI2^iv
Y09;VMl}(-UumAu607*qoM6N<$f*_Rp6aWAK

literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0bfZ(K~y-6ebYTlmSGeJ@SktcQxbt;2pU2lfenEmWC(2*?IKhN4q*-k
zfrCSdg9uJWxCjkGp|sW52M}>^)DO@gT7rcygZVOC=b_t+`{}^Nea>~>{?|GGyH0KC
zigN`&uz{02sG%hB3Fgp--#9}L#?X#+oY(3)j%hT7eGRPz|1&HW6B-NpLv&yQotVL4
zoZI+<&w*kHD|z>2Ttzd!;b!KaM{mS@&k?j>4@dEg_xP0+c#8!b2dXB8p$_0h=u4>2
z;nk8Vf>!K=UN23)Dr0z5k~@#p#u7&*vmanEyX(ijVu7Ey75aG~`y2Lwv;o-0YuWor
z6aNtUs6?hR`4r#hc$_;|B-&P_HMV8`mlzKHBW`e+NDG+4Bwk?_r}!h0XH8;Zx3tRr
zGKg>R&Oa(wTqe|ge8u(ZMO{gerx?K&Hl-o9qYt~$;NX7+s&WT+1I4!VJ0Isk7u6g=
U?Ab|VE&u=k07*qoM6N<$g5O!XoB#j-

diff --git a/assets/resources/snap_filled_16.png b/assets/resources/snap_filled_16.png
index 0db6956a91ebea1319b88038a44ac571863630aa..2e54503eef1f9393235f3caacce7c3e785db0336 100644
GIT binary patch
literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^AT}Qd8;}%R+`Ae`u@pObhHwBu4M$1`kk47*5n0T@
zz!nX{jGOF~+kt|TC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6f7@^o<w
z(U@3!e!upSLYd<qk3X-z@6kD#mDyVI%F-SmvDA%HXNppH@$CBjOsu}y=uVP@(#bSa
zt$!@tyNa$)o$`C$)9RSIJJnU+-~FuH7yo`ibZ72LrDcMTMa|hn-mYxt(ee!a8_OSY
z(o@Itsz8BukmyQJTW+oyPIlL}sdkjiS$*S$VXVg-FWJW`VrQD?ypDJOem7Zck&mzY
z<M}<i9#mZ0{;Sc@>ZaH8>{&A|muX12bfxvEwM}?0sKXIfKQAvua{s}^^rq5@NoiM1
zCq*3*yz#Y7J0R>(N{_n8hLw*T&n*?yFWX~n@c6I>OR8|ik%;~4i{EY0S)IIA{s-p_
XAL}<w(S?P;P+;(M^>bP0l+XkKbR(E~

literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`<(@8%Ar}5eC&%&~P~d2OxKA$q
z``t||B==uZRr}TPX<=^ascWv=Z)Y9Z_KZu!^p+muC59!HhuEGl|H-UVR6VfoI$r=o
zfWdNq<#+xbFIGAyEoNJ@r7^F7O(7@9iY4l)<%%2`XEQd<O~p?adq1-2ak2XAQ=~NG
a9Q)m5JwerqqnSV_FnGH9xvX<aXaWEsJ3-|D

diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py
index 26b08692..05c173df 100644
--- a/flatcamGUI/FlatCAMGUI.py
+++ b/flatcamGUI/FlatCAMGUI.py
@@ -2366,7 +2366,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         # ########################################################################
         # ######################## BUILD PREFERENCES #############################
         # ########################################################################
-
         self.general_defaults_form = GeneralPreferencesUI(decimals=self.decimals)
         self.gerber_defaults_form = GerberPreferencesUI(decimals=self.decimals)
         self.excellon_defaults_form = ExcellonPreferencesUI(decimals=self.decimals)
@@ -2381,7 +2380,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         # ########################################################################
         # ################## RESTORE THE TOOLBAR STATE from file #################
         # ########################################################################
-
         flat_settings = QSettings("Open Source", "FlatCAM")
         if flat_settings.contains("saved_gui_state"):
             saved_gui_state = flat_settings.value('saved_gui_state')
@@ -2439,15 +2437,42 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
             del qsettings
 
         self.lock_toolbar(lock=lock_state)
+        self.on_grid_snap_triggered(state=True)
+
         self.lock_action.triggered[bool].connect(self.lock_toolbar)
 
         self.pref_open_button.clicked.connect(self.on_preferences_open_folder)
         self.clear_btn.clicked.connect(self.on_gui_clear)
+        self.grid_snap_btn.triggered.connect(self.on_grid_snap_triggered)
+        self.snap_infobar_label.clicked.connect(self.on_grid_icon_snap_clicked)
 
         # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
         # %%%%%%%%%%%%%%%%% GUI Building FINISHED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
         # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+    def on_grid_snap_triggered(self, state):
+        """
+
+        :param state:   A parameter with the state of the grid, boolean
+
+        :return:
+        """
+        if state:
+            self.snap_infobar_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/snap_filled_16.png'))
+        else:
+            self.snap_infobar_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/snap_16.png'))
+
+        self.snap_infobar_label.clicked_state = state
+
+    def on_grid_icon_snap_clicked(self):
+        """
+        Slot called by clicking a GUI element, in this case a FCLabel
+
+        :return:
+        """
+        if isinstance(self.sender(), FCLabel):
+            self.grid_snap_btn.trigger()
+
     def eventFilter(self, obj, event):
         """
         Filter the ToolTips display based on a Preferences setting