From 786bf24f324fc727a8c85995411830640fa4308a Mon Sep 17 00:00:00 2001
From: Cyril Laguilhon-Debat <mecton@gmail.com>
Date: Tue, 6 Sep 2011 21:26:37 +0200
Subject: [PATCH] Moved "Clear" button to menu

---
 locale/fr/LC_MESSAGES/fr.po          |  12 ++++++++----
 locale/fr/LC_MESSAGES/pronterface.mo | Bin 8085 -> 8193 bytes
 pronterface.py                       |   7 +++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/fr.po b/locale/fr/LC_MESSAGES/fr.po
index 92fb9ae..7e1bba0 100755
--- a/locale/fr/LC_MESSAGES/fr.po
+++ b/locale/fr/LC_MESSAGES/fr.po
@@ -239,6 +239,14 @@ msgstr " Quitter le programme"
 msgid "&File"
 msgstr "&Fichier"
 
+#: pronterface.py:284
+msgid "Clear console"
+msgstr "Effacer la console"
+
+#: pronterface.py:284
+msgid " Clear output console"
+msgstr "Effacer le contenu de la console de sortie"
+
 #: pronterface.py:285
 msgid "&Macros"
 msgstr "&Macros"
@@ -363,10 +371,6 @@ msgstr "Pause"
 msgid "Send"
 msgstr "Envoyer"
 
-#: pronterface.py:462
-msgid "Clear"
-msgstr "Effacer"
-
 #: pronterface.py:460
 #: pronterface.py:518
 msgid "mm/min"
diff --git a/locale/fr/LC_MESSAGES/pronterface.mo b/locale/fr/LC_MESSAGES/pronterface.mo
index 2a320dfb2e96588ba204cacb2bbe1e9e076b8c4e..0dc2de7b77b999a0978d95227a2da47bc0089122 100644
GIT binary patch
delta 2568
zcmYk-YfzL`9LMp)3c-d#tP)fLi<ygHf+?CQ0$vak<&v06B-^rE#IlR9`>M+mWo6AU
zspUAnXr>o2z34?3%qg=P%dvb>)-*LSHjZO<r?FCJv}TyTzh@5(&+PyCob&9%x%|&L
z%YoXVI_In}{ea=xMa(8%oo38IT#(6)Yme8M8}T{J$5+sYM=%#pVK$E0`j0r1`W0M+
z-s@9;zXJ29w_z4`V}>z~>7$^&2JIJ*Sa&0Bm|?sX4<aA)zI}cY)!>&{f#;F2n;b@y
zjy{}@1$Z6KMP4x#)}=Uu{!KjvMq-*#18KK*qGle(8Tcqx;`68(9K}Zb1l90#dMm*K
zyaAV?+HJ%F+>B}`V!uydCjFbIDJYf0I167!&HQb>fX7fXI)Q5Nl=Zar8`KQX;3hne
zTB<5~Q#%c)c3Q9ww;^LThtSarBNQ}%H&AQ$5o$(XBW;<p$jAK7O&wjsd1!Ksxd{T;
zjP>ZjeW*S15^6%Pp$2{o)!xUb44uv)|N7#bec>n6nvSDVKY^M_KBLpXDo`EPqW*3>
zYCt<tGmO}J%+`~rrFslC(PvNt+KV)8Msmr2C56L0P>L^LA^vLX9)_t+m5H}tHWp(5
zby^xQi6K-6W2n^rfa>5PR^tSA;u2=ph5NAxFF6!6qCE1Y)Xl>=I3G2`Ce#euFqX!Q
zQ3Lplbd=-Is0{gNM42f=UNNgt&)ZR%?8R01B<j86s7yO&C}^$!K&9#`DwS#cwVr!X
z&u5|5t_am}IclcusF?;)yT2c+aWAT!lc>ymfh5&@XP^I)(lLKh&<L-hMxIMWe>ex#
zaXG4i#mL9haMN+xf=w8;_4iOI{t7kFN?uZ?R$>`;pxWDw+PuS9sPliAg4XhL`@(Oi
z&2|Zus!TS78Z1RE#X{5ot5E~1v97naqV`e;-iux6$9GW^977Fc9CzsaU!kD2ZlO1I
zv=!%K2sN-h$f}qT)FwP?{T9{G-?$wAMLwqbW=;Y&qXv2ewb?$zQv4p(-vm0^Z0WSB
zpV$Cuh8s~0x1l=jK&7%D`Ir~1uj72`pQ84_U&uyxN3Fe)$LN)zB2;?;R0gV0zb9*E
zlYg>oT6w_on;u+*4yu8-P;2!8Y9<$~<ETw|88v_srl*;0z^AYm)$v7CJJ(Q|$zT>;
zSb{_NL^1h)oPvj~s|*YwlQ1Kw<9Hk^@dPSmmr)t|2h(r~p$>Y8dP0M7Gk}xV0t%W$
zm3^?vs^jN#xG^}>ZXb4I8L`XOL%594;5HF`1bw@Mh+_kx>z)+utW{K2b;Ss!el77Z
zv7M+RZYOj(T3=lohzE%%QA_BoPF_1GY$Wa@!o(Uv>DSdrXe~K)?(ana?;yyqxtq|X
zrPYb(Cz=TMyZal#-gDgaQg{D{x2Z7Y(wgs_QlDnaI-VWGYFiIt4be<=5f2a^LZ|39
zLRW;?;+9gk`$7B9J#xKNbXM1;zH{#nac`YcS8<!Icj9J(6Xb5J71%;7CA3dg61vtC
zeigX3653n3781*eyOfGjLc9J>LYI!x;urh8#lCQGz#mU0`jZKNC>|S(N5iAfdiSMe
z{a-80K9p6yE)ofb!UO(jSkDvTSkm7e_D6%0Z>csIA4v3sN8g;8;mMxz)#y9<=e+*`
DIg#a$

delta 2483
zcmZA1YfRQv9Ki8|QUP8AL{v&p^O6}@Y0^b71IYw$cuBlqN(80gz;#*k(P>^bFUvAz
z)@n63*Tv<Yv^A?2*@m`W#Ea?$D|KnB-k6JOYqR=(9}aIi<M;pk&;NNi=lp)>{GV;*
zhsqK^WTzhrv{s^kc&&d3J}9_}3#~OXggo4Y*|-~r;87fa@5cT|m_xr4r(!qye}l3@
zxEaS`22RHtund_Z5h~&b)zPKM|AsX<7Mqa2urEG8f)4l=PR0+BHHV9sj+b#D{(?8+
zpU7Xh9?f9YE+8jmB7_m#nC$521a#%aI0!4T7;DiCc3>6mLkIpAN8=?NifPR51lc$o
z^U-li(9dV0^UcR0%paC<lZ%aL<}buA>_ju#j}G{9v?KZkn&C05#`ka-{*8_^lv$l<
zB$neCWQ}1R`gsc`+{@><aqsq^8NH5-5so8&;S?7qI*a4+OB{jMa6S$g96~>=L(j-+
zG@(uC!gr$M?L{ll5ud*^nEm$)AMn6EJ&l(B9Gb}mbYXv>6K1knzdsgT&?Gd&lGvXS
z`(@}>%|SC=fG%hSGE`{6V%%c=E%6B+<YN-;e}x{ZE*yp5;H`KKeM^Rt#%7#?PVhEb
z+V{~3KE`Qy4p-qnSdS~o@)rCQT~K#|8%y^aj=|s24D+a?85ZEiG%`jPaFB9XnUiQm
zI?<9}iqCt{3T83-Oe{jbSC0%Go=3NMFIu6*VQwtpoAHC=@q;9~XP@BhcplBL2hGq`
zc<P6snHHntG@upPfD|h{6QA#j9zYj(xVN7OC*lXE(G`7$4$z5yu?u~Te#Uv|L;KZe
zX&camo<%G4HBQ8<=y>^j*+W}|ZgCa5g=;Z`^B1;oL)F4Av{XmY0Z*Y@@Hv{<d30f2
z(eCIK^vqnvW!Qs-IFH%fnhoeew&DuhgKqI<9O(Q1D>vitFLY%Etb!_sQuOfEM4Qop
zc48?WK>oscE>GZ(=tAd?>^)?Qu!w#uI^jX|j2%ILS<hg?3@>owz(1iAUqwrq&g?E=
zY_tp~(XT_#z>CPi4zHkR;}}|@ljwM7&<cEk{8WVRkm7_Z$Zm$~qp1H>ZgNQ50V>eF
zT8L)yY;-Gn2zR3kNTQj2kK6HIbmHy2TaL32txN~jV-mMvE?I5CSJ4U#8%_OLOep0j
z`x-96VqA`vY&Tk={g{UL5tgutm`t<~8wgMOqlB%HSV*`fcN4aIh;@WjGm(c0TYiGe
zZG@|DB>vwX<3T0i$!{Q56ZM3vFC&@>o7p}<%(p{JCDnVIx=!c%ByoRyb_doF&L5T#
z?oX8+nw3~dxQEjSOYIx-6w#mPYgWcKx0kRudKbE_>`LlKXi9uui}w=aWB+mI_vAkq
zABewFHV=-?1LmHW6AOsG<~FS&W)Pg$RC}6hD^bzg4R_*1;t^s6v7WG%5bP+8{5cC@
zR;m-iY~-w@4v~+t2oIvC)!zi$Mj}0R7s66pPSg>;IsE3N&W*nVYlyx!hns3*0<o4@
zL_9<cPp!Og*81knZS94ND`(BFEo^IOZ*SVz*p@t%`BGZ4W<W<qGCMcDU$Q9gV&;D!
Crq6c(

diff --git a/pronterface.py b/pronterface.py
index 865d022..8acf6de 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -281,6 +281,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         m = wx.Menu()
         self.Bind(wx.EVT_MENU, self.loadfile, m.Append(-1,_("&Open..."),_(" Opens file")))
         self.Bind(wx.EVT_MENU, self.do_editgcode, m.Append(-1,_("&Edit..."),_(" Edit open file")))
+        self.Bind(wx.EVT_MENU, self.clearOutput, m.Append(-1,_("Clear console"),_(" Clear output console")))
         self.Bind(wx.EVT_MENU, self.OnExit, m.Append(wx.ID_EXIT,_("E&xit"),_(" Closes the Window")))
         self.menustrip.Append(m,_("&File"))
         
@@ -298,6 +299,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             self.Bind(wx.EVT_MENU, lambda *e:SkeinforgeQuickEditDialog(self), m.Append(-1,_("SFACT Quick Settings"),_(" Quickly adjust SFACT settings for active profile")))
         except:
             pass
+
         self.menustrip.Append(m,_("&Settings"))
         self.update_macros_menu()
         self.SetMenuBar(self.menustrip)
@@ -451,7 +453,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         self.logbox.SetEditable(0)
         lrs.Add(self.logbox)
         lbrs=wx.BoxSizer(wx.HORIZONTAL)
-        self.commandbox=wx.TextCtrl(self.panel,size=(240,30),pos=(440,420),style = wx.TE_PROCESS_ENTER)
+        self.commandbox=wx.TextCtrl(self.panel,size=(295,30),pos=(440,420),style = wx.TE_PROCESS_ENTER)
         self.commandbox.Bind(wx.EVT_TEXT_ENTER,self.sendline)
         #self.printerControls.append(self.commandbox)
         lbrs.Add(self.commandbox)
@@ -459,9 +461,6 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         self.sendbtn.Bind(wx.EVT_BUTTON,self.sendline)
         #self.printerControls.append(self.sendbtn)
         lbrs.Add(self.sendbtn)
-        self.clearbtn=wx.Button(self.panel,-1,_("Clear"),size=(55,28), pos=(750,420))
-        self.clearbtn.Bind(wx.EVT_BUTTON,self.clearOutput)
-        lbrs.Add(self.clearbtn)
         lrs.Add(lbrs)
         
         #left pane