From 79c737ea2f3a416d0e519b6292c25b17adc61838 Mon Sep 17 00:00:00 2001 From: NaruX Date: Sun, 7 Oct 2018 12:13:17 +0200 Subject: [PATCH] Im Entwirckler einen "Nur hochladen" Button eingebaut ?bersetzung --- doc/revpidevelop.html | 9 ++++-- eric-revpipycontrol.api | 2 +- revpipycontrol.e4p | 4 +-- .../locale/de/LC_MESSAGES/revpipycontrol.po | 28 +++++++++++-------- revpipycontrol/revpidevelop.py | 22 ++++++++++----- revpipycontrol/revpipycontrol.py | 2 +- setup.py | 2 +- 7 files changed, 43 insertions(+), 26 deletions(-) diff --git a/doc/revpidevelop.html b/doc/revpidevelop.html index b4b4a25..983dbd2 100644 --- a/doc/revpidevelop.html +++ b/doc/revpidevelop.html @@ -115,10 +115,15 @@ Erstellt alle Widgets.

RevPiDevelop.btn_domyjob

-btn_domyjob() +btn_domyjob(stop_restart=True)

Hochladen und neu starten. -

+

+
stop_restart
+
+Bestehendes Programm Beenden/Starten +
+

RevPiDevelop.btn_selectpath

btn_selectpath() diff --git a/eric-revpipycontrol.api b/eric-revpipycontrol.api index 869b6bb..6de61a4 100644 --- a/eric-revpipycontrol.api +++ b/eric-revpipycontrol.api @@ -69,7 +69,7 @@ revpicheckclient.__license__?9 revpidevelop.RevPiDevelop._checkclose?5(event=None) revpidevelop.RevPiDevelop._createwidgets?5() revpidevelop.RevPiDevelop.app?7 -revpidevelop.RevPiDevelop.btn_domyjob?4() +revpidevelop.RevPiDevelop.btn_domyjob?4(stop_restart=True) revpidevelop.RevPiDevelop.btn_selectpath?4() revpidevelop.RevPiDevelop.cli?7 revpidevelop.RevPiDevelop.load_pathfiles?4(silent=False) diff --git a/revpipycontrol.e4p b/revpipycontrol.e4p index 8fd9c6f..66e0012 100644 --- a/revpipycontrol.e4p +++ b/revpipycontrol.e4p @@ -1,14 +1,14 @@ - + en_US 66103e2eaf8a762f14d1fd51d8b1c9dcaf35a275 Python3 Console - 0.7.0 + 0.7.1 Sven Sager akira@narux.de diff --git a/revpipycontrol/locale/de/LC_MESSAGES/revpipycontrol.po b/revpipycontrol/locale/de/LC_MESSAGES/revpipycontrol.po index e9ea4e7..23c3081 100644 --- a/revpipycontrol/locale/de/LC_MESSAGES/revpipycontrol.po +++ b/revpipycontrol/locale/de/LC_MESSAGES/revpipycontrol.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: RevPiPyControl 0.4.0\n" -"POT-Creation-Date: 2018-10-07 11:51+0200\n" -"PO-Revision-Date: 2018-10-07 12:00+0200\n" +"POT-Creation-Date: 2018-10-07 12:08+0200\n" +"PO-Revision-Date: 2018-10-07 12:08+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de\n" @@ -93,8 +93,8 @@ msgstr "" "IP: {0} / Level: {1}" #: aclmanager.py:291 aclmanager.py:367 revpicheckclient.py:112 -#: revpicheckclient.py:335 revpicheckclient.py:460 revpidevelop.py:209 -#: revpidevelop.py:217 revpidevelop.py:244 revpilegacy.py:318 +#: revpicheckclient.py:335 revpicheckclient.py:460 revpidevelop.py:216 +#: revpidevelop.py:224 revpidevelop.py:252 revpilegacy.py:318 #: revpioption.py:115 revpioption.py:436 revpiplclist.py:227 #: revpiprogram.py:329 revpiprogram.py:360 revpiprogram.py:423 #: revpiprogram.py:429 revpiprogram.py:435 revpiprogram.py:443 @@ -246,7 +246,7 @@ msgstr "Aktualisiere Werte automatisch" msgid "Write values to RevPi" msgstr "Schreibe Werte auf RevPi" -#: revpicheckclient.py:292 revpidevelop.py:276 revpiprogram.py:456 +#: revpicheckclient.py:292 revpidevelop.py:284 revpiprogram.py:456 #: revpipycontrol.py:255 revpipycontrol.py:304 revpipycontrol.py:338 #: revpipycontrol.py:356 revpipycontrol.py:389 msgid "Warning" @@ -291,12 +291,16 @@ msgstr "Pfad wählen" msgid "Stop / Upload / Start" msgstr "Stoppen / Hochladen / Starten" -#: revpidevelop.py:200 revpilegacy.py:273 revpilegacy.py:310 revpioption.py:365 +#: revpidevelop.py:161 +msgid "Just upload" +msgstr "Nur hochladen" + +#: revpidevelop.py:207 revpilegacy.py:273 revpilegacy.py:310 revpioption.py:365 #: revpioption.py:428 revpiplclist.py:219 revpiprogram.py:97 msgid "Information" msgstr "Information" -#: revpidevelop.py:201 revpiprogram.py:98 +#: revpidevelop.py:208 revpiprogram.py:98 msgid "" "A PLC program has been uploaded. Please check the PLC options to see if the " "correct program is specified as the start program." @@ -304,23 +308,23 @@ msgstr "" "Ein PLC Programm wurde hochgeladen. Bitte prüfen Sie die PLC Optionen, ob " "dort das richtige Programm als Startprogramm angegeben ist." -#: revpidevelop.py:210 revpiprogram.py:768 +#: revpidevelop.py:217 revpiprogram.py:768 msgid "The Revolution Pi could not process some parts of the transmission." msgstr "Der Revoluton Pi konnte Teile der Übertragung nicht verarbeiten." -#: revpidevelop.py:218 revpiprogram.py:776 +#: revpidevelop.py:225 revpiprogram.py:776 msgid "Errors occurred during transmission" msgstr "Bei der Übertragung traten Fehler auf" -#: revpidevelop.py:229 +#: revpidevelop.py:237 msgid "Directory to watch" msgstr "Ordner zum Überwachen" -#: revpidevelop.py:245 +#: revpidevelop.py:253 msgid "Can not open the selected folder." msgstr "Kann gewählten Ordner nicht öffnen." -#: revpidevelop.py:277 +#: revpidevelop.py:285 msgid "" "Found more than 1000 files! Only 1000 files can be shown in this dialog, all " "other will be ignored." diff --git a/revpipycontrol/revpidevelop.py b/revpipycontrol/revpidevelop.py index 349c301..2958e00 100644 --- a/revpipycontrol/revpidevelop.py +++ b/revpipycontrol/revpidevelop.py @@ -152,15 +152,22 @@ class RevPiDevelop(ttk.Frame): btnlist.grid(row=r, columnspan=2, sticky="we") self.btn_jobs = ttk.Button(btnlist) - self.btn_jobs["command"] = self.btn_domyjob + self.btn_jobs["command"] = lambda: self.btn_domyjob(stop_restart=True) self.btn_jobs["text"] = _("Stop / Upload / Start") + self.btn_jobs.grid(row=0, column=0, **cpadwe) + + self.btn_jobs = ttk.Button(btnlist) + self.btn_jobs["command"] = lambda: self.btn_domyjob(stop_restart=False) + self.btn_jobs["text"] = _("Just upload") self.btn_jobs.grid(row=0, column=1, **cpadwe) - def btn_domyjob(self): - u"""Hochladen und neu starten.""" + def btn_domyjob(self, stop_restart=True): + u"""Hochladen und neu starten. + @param stop_restart Bestehendes Programm Beenden/Starten""" - # PLC Programm anhalten - self.xmlcli.plcstop() + if stop_restart: + # PLC Programm anhalten + self.xmlcli.plcstop() # Aktuell konfiguriertes Programm lesen (für uploaded Flag) opt_program = self.xmlcli.get_config() @@ -219,8 +226,9 @@ class RevPiDevelop(ttk.Frame): parent=self.master ) - # PLC Programm starten - self.xmlcli.plcstart() + if stop_restart: + # PLC Programm starten + self.xmlcli.plcstart() def btn_selectpath(self): u"""Lässt dem Benuzter ein Verzeichnis auswählen.""" diff --git a/revpipycontrol/revpipycontrol.py b/revpipycontrol/revpipycontrol.py index dea88e2..a9347ca 100755 --- a/revpipycontrol/revpipycontrol.py +++ b/revpipycontrol/revpipycontrol.py @@ -5,7 +5,7 @@ u"""RevPiPyControl main program.""" __author__ = "Sven Sager" __copyright__ = "Copyright (C) 2018 Sven Sager" __license__ = "GPLv3" -__version__ = "0.7.0" +__version__ = "0.7.1" import revpicheckclient import revpidevelop diff --git a/setup.py b/setup.py index e1eeed6..34344cb 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ globsetup = { "author_email": "akira@narux.de", "url": "https://revpimodio.org/revpipyplc/", "license": "LGPLv3", - "version": "0.7.0", + "version": "0.7.1", "name": "revpipycontrol",