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 2a320df..0dc2de7 100644 Binary files a/locale/fr/LC_MESSAGES/pronterface.mo and b/locale/fr/LC_MESSAGES/pronterface.mo differ 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