From 7b4e3b42bf00cb606e00c4bfed362674c8892758 Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Tue, 2 Jun 2020 02:37:54 +0300
Subject: [PATCH] - fixed spacing in the status toolbar icons

---
 AppGUI/MainGUI.py                             |  19 ++++++++++--------
 CHANGELOG.md                                  |   1 +
 .../resources/dark_resources/edit_file16.png  | Bin 510 -> 420 bytes
 .../resources/dark_resources/edit_file32.png  | Bin 716 -> 657 bytes
 assets/resources/edit_file16.png              | Bin 504 -> 460 bytes
 assets/resources/edit_file32.png              | Bin 700 -> 606 bytes
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/AppGUI/MainGUI.py b/AppGUI/MainGUI.py
index 6b1fc3d3..3eacb91e 100644
--- a/AppGUI/MainGUI.py
+++ b/AppGUI/MainGUI.py
@@ -1095,8 +1095,8 @@ class MainGUI(QtWidgets.QMainWindow):
         self.grid_gap_y_entry.setMaximumWidth(70)
         self.grid_gap_y_entry.setToolTip(_("Grid Y snapping distance"))
         self.status_toolbar.addWidget(self.grid_gap_y_entry)
-
         self.status_toolbar.addWidget(QtWidgets.QLabel(" "))
+
         self.axis_status_label = FCLabel()
         self.axis_status_label.setToolTip(_("Toggle the display of axis on canvas"))
         self.axis_status_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/axis16.png'))
@@ -1107,17 +1107,27 @@ class MainGUI(QtWidgets.QMainWindow):
         self.pref_status_label.setToolTip(_("Preferences"))
         self.pref_status_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/settings18.png'))
         self.status_toolbar.addWidget(self.pref_status_label)
+        self.status_toolbar.addWidget(QtWidgets.QLabel(" "))
 
         self.shell_status_label = FCLabel()
         self.shell_status_label.setToolTip(_("Command Line"))
         self.shell_status_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/shell20.png'))
         self.status_toolbar.addWidget(self.shell_status_label)
+        self.status_toolbar.addWidget(QtWidgets.QLabel(" "))
 
         self.hud_label = FCLabel()
         self.hud_label.setToolTip(_("HUD (Heads up display)"))
         self.hud_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/hud16.png'))
         self.status_toolbar.addWidget(self.hud_label)
+        self.status_toolbar.addWidget(QtWidgets.QLabel(" "))
 
+        self.wplace_label = FCLabel("A4")
+        self.wplace_label.setToolTip(_("Draw a delimiting rectangle on canvas.\n"
+                                       "The purpose is to illustrate the limits for our work.")
+                                     )
+        self.wplace_label.setMargin(2)
+        self.status_toolbar.addWidget(self.wplace_label)
+        self.status_toolbar.addWidget(QtWidgets.QLabel(" "))
 
         self.ois_grid = OptionalInputSection(self.grid_gap_link_cb, [self.grid_gap_y_entry], logic=False)
 
@@ -1549,13 +1559,6 @@ class MainGUI(QtWidgets.QMainWindow):
         self.status_toolbar.setMaximumHeight(24)
         self.infobar.addWidget(self.status_toolbar)
 
-        self.wplace_label = FCLabel("A4")
-        self.wplace_label.setToolTip(_("Draw a delimiting rectangle on canvas.\n"
-                                       "The purpose is to illustrate the limits for our work.")
-                                     )
-        self.wplace_label.setMargin(2)
-        self.infobar.addWidget(self.wplace_label)
-
         self.units_label = QtWidgets.QLabel("[mm]")
         self.units_label.setToolTip(_("Application units"))
         self.units_label.setMargin(2)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98eaa8d6..98294a0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG for FlatCAM beta
 - Tcl Command Isolate - fixed to work in the new configuration
 - Tcl Command Follow - fixed to work in the new configuration
 - Etch Compensation Tool - added a new etchant: alkaline baths
+- fixed spacing in the status toolbar icons
 
 1.06.2020
 
diff --git a/assets/resources/dark_resources/edit_file16.png b/assets/resources/dark_resources/edit_file16.png
index 05185539e394ed3e1edf4460d29e07d144622e4d..cf98fe7fe906c0bd7410945c7b1eb54c07967f72 100644
GIT binary patch
literal 420
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fXMsm#F#`kN
z5fEmas?8@26r2;_6XFV_AHRG%I8ltm!|g!#nUn<i1v3=B{Juk|=B_+j*Rl)u6TXQQ
z{I$Cp^wj;GgO=V4?`oFM8^T==teuj_y7gS+g4@qMpCoE9-TLw8Bv5~%r;B4q#hl~>
z2L?B_G_f!hJ85fnb#Zf{`R&vD8z;+m>MLj*QP*iYA}%WYeCh<3XWpKtPXu-9w;!7x
z9uVU6%vfXf3NBCOkCIoen1+~6{J|4-%W7BEFONEt08<kqw@1tjv-WZ`_gwy30<?_5
M)78&qol`;+06gX9<^TWy

literal 510
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+uenMVO6iP5s=4O
z;1OBOz`%C|gc+x5^GO2**-JcqUD=<o@QMm>NXVC61PYz;ba4#PIA3~Uqh52O$gz*|
z@k_gBXDn)-v8z<1TDg#0MU9jB&;vOaj`(V3vCU`obY|$3vfd4SC1H2<dv@G&9shHm
z?fw1EIUQ&&&&<71{C~A`htZWPf#w&XRe|f&%5q;llz(t^YNvBXN~3qcvICo}53^+6
zTy;bwqpFCD>-9X@%&=pBc)h)}&!smXn^U_sKd02pOPEXimz}J|IrTY`zc%IHw%{+>
zvgW4eTdRWCS7*Qfbv0O_q~^t|e@k6uB`gC~y8GQUFO*HLtdOo_n8<JOxpGFIEzn=8
zC9V-ADTyViR>?)FK#IZ0z{o(?z(m*3B*ehL%FxWpz(Uu+*vi15_k-hc6b-rgDVb@N
zxHbG)`?DITK@wy`aDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0uvp00i_>zopr
E0G@QNEC2ui

diff --git a/assets/resources/dark_resources/edit_file32.png b/assets/resources/dark_resources/edit_file32.png
index 98f49fde3a1a904d23d925b0b9d439c9fc1d2213..b29458c9ebd82994bb1529ef657400db71c0f6be 100644
GIT binary patch
literal 657
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9F5
zM?jcysy3fAQ1DNHPlzj!e*E(7FhEa8_l5tfn}$IDhm-{Q1vBVxdh_?yTGfQ_|382A
z{?#BN(W~4&XOgS*leDHEfBMw#O5JPT)xP7c7|$2u87493p9u>5KBv9q!m?N)8HIn3
z8J`zTX14FYwsrT%Z|jeiSg@bD)#>(k`8H5Yobz;X45^s&_U!Q>rbLmJi)j-Kd<9fG
zCQbGdkWtlU(z5J&|6h+MSnq$g^z<*U!sf1j#q{c?$?w*~FNH)3UN33?@=N9WXQPG(
zqI(rj9=;}+7*g=+`f=@J(p&EztM7IRdh2jX>(UvHd1oWzO`f^xi>$o=@t@-tp+_k@
ziw*^*{`~mn|EsO`GNpEs%m4gr%`r)J?_Fy)dDG&<dFy@uuYPjk0_)}siKhKu@3UKo
zId4rq!e3L@t1coFoVD5V<k3sZN^bbRS$}Qz+F6ZvzyCWv;ldrp#0Q!#GbdCn1^SG^
M)78&qol`;+0BA9q{Qv*}

delta 682
zcmbQpdWLm^WDpAj1H;YYP4z&ECEd~2k%3`jKlh(RRv=#?*(1o8fuTx`fuW&=f#DZW
zsNn?zL#Y7+!>a@a2CEqi4B`cIb_Lo1C76=D-CY<MR`n_yP1KX9XD{*eb!C6T!YeAk
z-&Xy&h=GA|mZytjh{y4{Q|-N-0ws>sXDz(qxMYE1Z&L=>BKzvJ2^x(T0s?ev8}>Q>
z;LOU%$mTkfRiOQ5zN@426{$4A5EIsy8z&e@3wiH-ey6&6+4SmjpR4D8Z#`W&Wu=DV
z@{3+~gr4pDw|X&`#p5}?z4i5udR^>JUptoBe^s6?<q#3`;izHqRu1)RQ`4KOFMatZ
z&cLd+^YIJ)LvjZgE~ea!n&KG8nBmqDx~PmX`_Zmh<z0@yIqzAnx%PKI!*1)0fLf-5
zY`V8(K6}U>&`(b4Ty*H&w8Dqa-Pjo-6qhqpbk6QgSP~}oQt4pl#f3kGZd<0-H=4~<
zN=fbP{Z@OAbCUS$Gm?LE{J6hyRNC--NGWfTubyHfH)+eJ9R3H%)A<)YDcJ1G|9H<$
z#vdLZJzHe*%3dfR+5FM<vFa|16*p{EUWVNc<!pOmP-nI3;ncFwrUg5c4hu?JmEOJD
zV0h<8s)NXvyH}N`R3`fO7$u~It9H!1d8S_IMnG+o(1c}6cD!A6=K{l~B(e3o=AW2&
zmHE`I?-x^A7?j0g8}DCA{9CzRGPQf={8!Rti8=C@5BMwuMx|<rYeY#(Vo9o1a#1Rf
zVlXl=GSD?J(KR#)F)*+)G_x`^)ip4-GB8l+RhWsQAvZrIGp&-r$QPH6zzZ`}fjT5X
uRs`p#m6RtIr81P4m+NKbWfvzW7NqLs7p2dBXCnnv#Ng@b=d#Wzp$P!CK@&*;

diff --git a/assets/resources/edit_file16.png b/assets/resources/edit_file16.png
index b8bedd050980f690290d7cebb5579d8e9ad5ee5b..eef2dbe9d480afe97efb3569f026663fd1b5ac8a 100644
GIT binary patch
literal 460
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fXMsm#F#`kN
z5fEmas?8@26kHwP6XFV_hYBz;-Qogtt7S=$Uob=di|<<ntM90APF#H9egfB5k-u&i
zgPy*%3((Sg=^LnB^~{Im^M){Qmji3PrsQrr*R<fd$HR4r8ca&l3^oA`DfM)545^rt
zoZ!IVrj{lareY^;&8{wPE;PS=dVga)L#O@;jU(zhO-IB<g`bH|cle-sbjgy`l+Nd;
z6F)tDSi?HuXV9fCuYi4<x>n6vG{t7J)fq;qSy4`xF8SOl5P$VTEBocatIUo28Wnd>
jG@K;w>vQ&u?t~u<TQj(`*FUmr0)@DztDnm{r-UW|82f59

literal 504
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+uenMVO6iP5s=4O
z;1OBOz`%C|gc+x5^GO2**-JcqUD+RVi3n<lb1nUO9w>Co)5S4F<9z7_Lq8`+k=BR&
z@@;Lt6C4uPywKpaRV?J55HT}Dk&XLXf=`d#jfUQ>bN3!(TbWV7`Xz~>TivL?XZfz;
zbN1<Z%NXL$wq#j-7m`}J$IUJ3W`)ACsm5=4I+=yPhpqcpuT;>zzkO5sXN5HuXWMiG
zjLMjW)bD+r^2l4xEA;NWo=0(i5;9(9q_^^RT06(<#U7Vtd$uq3MZ~ejU0um{4bCz9
z+xe{h9G&0TyUU-qcmFnDxri6uP2KroiUFS`e!i0W!?5d(25W(ZgdWgGswJ)wB`Jv|
zsaDBFsX&Us$iUE2*U&)M$RNbf+{(nj%E(yTz{JYH;H2}4sVEw9^HVa@DsgMrAt#^-
x)F276Aviy+q&%@Gm7%=6TrV>(yEr+qAXP8FD1G)j8!4b722WQ%mvv4FO#s`Zr!N2i

diff --git a/assets/resources/edit_file32.png b/assets/resources/edit_file32.png
index 8d340239d6451de5cd6f29a324b8fb8cd31844be..1f517bb8ab3bdc169c315783eba09afa3433d59e 100644
GIT binary patch
delta 434
zcmdnPdXHs7XZ;g4MsXq8lC%?i3=E7qo-U3d9>?Ea*{^-1P=fu#^yH+E$%zX+az3eh
zJU^cB;k-dos9US++{TL;J0wI4Q@3__s2San-F5uI>~~`Ck_}Fz*Sz{_^ZxvDfBww$
z18vg!c{!3kTTWC99a=3g@9dI~lBtQ;JLV*^KD1Ol%C3JUl<QD^niPL(@cgZb53O4D
zBQrBDzVbC~J)9NW9r#eIx7>R5?i2Gi%sY2}lZf@9#s5m~^-k4s|CenSd)#_1hpKHt
z<ce9ppYK29|DP-V53Ak956{or|F`jW`uY2Axyqeazclm11)WX?R8`Cn?VGx(bgqT$
zwH8*}$nJ$9=UNT!efZ_u-d-PP%3m~L=??Fi_tJv8olPy1KWV)PHhjNeCtD8p?{797
ziXpNyGsF&;vSsV7nR#_$Q)aQ|@)avy*!9-UDKA>`^=`Rj@J$8=2GtVRh?11Vl2ohY
zqEsNoU}Ruqple{JYhV~+WNc+<VP#~YZD3$!U~oXb$rhnO9jGHWKP5A*61R?xPF9VR
HyO|6DXF9t>

delta 529
zcmcb|vWIm-XZ>R?5kU=cuBAWEGcYiAdAc};cpRTQ)z_OTP^4}Cm4F}@uBat}f@_&x
zCeN1=@lx2b#_S)%f9D_ESr-?@u2xtg_Kr(?vqpyCR$fC+tti&BOB55gd8pezyEpUY
z-r1+;{<eE=%ihNAyL6@W8m8oumF~A=i;l`Asd{|!XbJkgadB$>|0BID8%~(spCg#(
ze#1b2Dy!EM$^ZHcr*u9#tP@S-UC>-GV_O*KM>Yq2xosVhtU1NYpT?%0s%qj|eyi>i
ze?lo+>?@xKiPP;e`%LXp80-tLt>k*+7xZK2bVdfVKo$ml&BbD0o~WHP$UOJePKv*<
zfm`UyWYwg!j=SHIwORsh)+dI(Pv1OqgL`11;FFtK-21;tXz3a4xVeGtL*WT^Ly<Xe
zj8ECT4`Z;~R3qqm@Fb(KOU1?gE9_mY)p>V!^C&0n);MTl{6q4}A?~+}SQPU#CoDcN
zVa+ZHfn%NX8B!}t3%N_<ER*^cOpKkPke6cYmEbs+Gs|J#tOwin7CJL&Y-*|x4+>bQ
z!G2}w`^ApjjA_2Rn5x>3ov(iFWu9x#x2bu@x%nzT7#J8-OI#yLQW8s2t&)pUffR$0
zfuW_Yp@FWEL5QKbm5G6sk+HUciIsuDN#_+)Q8eV{r(~v8;?lroV6a0@Ky$J#lOX`_
C&eSvj