revpi/revpipycontrol
1
0
Fork 0
mirror of https://github.com/naruxde/revpipycontrol.git synced 2025-11-08 23:53:52 +01:00
Code Issues Releases Wiki Activity

Im Entwirckler einen "Nur hochladen" Button eingebaut

Browse Source 
?bersetzung
This commit is contained in:
Sven Sager
2018-10-07 12:13:17 +02:00
parent 55c1349edf
commit 79c737ea2f
7 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/revpidevelop.html
View File

@@ -115,10 +115,15 @@ Erstellt alle Widgets.
</p><a NAME="RevPiDevelop.btn_domyjob" ID="RevPiDevelop.btn_domyjob"></a> </p><a NAME="RevPiDevelop.btn_domyjob" ID="RevPiDevelop.btn_domyjob"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiDevelop.btn_domyjob</h3> RevPiDevelop.btn_domyjob</h3>
<b>btn_domyjob</b>(<i></i>) <b>btn_domyjob</b>(<i>stop_restart=True</i>)
<p> <p>
Hochladen und neu starten. Hochladen und neu starten.
</p><a NAME="RevPiDevelop.btn_selectpath" ID="RevPiDevelop.btn_selectpath"></a> </p><dl>
<dt><i>stop_restart</i></dt>
<dd>
Bestehendes Programm Beenden/Starten
</dd>
</dl><a NAME="RevPiDevelop.btn_selectpath" ID="RevPiDevelop.btn_selectpath"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiDevelop.btn_selectpath</h3> RevPiDevelop.btn_selectpath</h3>
<b>btn_selectpath</b>(<i></i>) <b>btn_selectpath</b>(<i></i>)

2
eric-revpipycontrol.api
View File

@@ -69,7 +69,7 @@ revpicheckclient.__license__?9
revpidevelop.RevPiDevelop._checkclose?5(event=None) revpidevelop.RevPiDevelop._checkclose?5(event=None)
revpidevelop.RevPiDevelop._createwidgets?5() revpidevelop.RevPiDevelop._createwidgets?5()
revpidevelop.RevPiDevelop.app?7 revpidevelop.RevPiDevelop.app?7
revpidevelop.RevPiDevelop.btn_domyjob?4() revpidevelop.RevPiDevelop.btn_domyjob?4(stop_restart=True)
revpidevelop.RevPiDevelop.btn_selectpath?4() revpidevelop.RevPiDevelop.btn_selectpath?4()
revpidevelop.RevPiDevelop.cli?7 revpidevelop.RevPiDevelop.cli?7
revpidevelop.RevPiDevelop.load_pathfiles?4(silent=False) revpidevelop.RevPiDevelop.load_pathfiles?4(silent=False)

4
revpipycontrol.e4p
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Project SYSTEM "Project-5.1.dtd"> <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
<!-- eric project file for project revpipycontrol --> <!-- eric project file for project revpipycontrol -->
<!-- Saved: 2018-09-03, 16:25:26 --> <!-- Saved: 2018-10-07, 12:09:56 -->
<!-- Copyright (C) 2018 Sven Sager, akira@narux.de --> <!-- Copyright (C) 2018 Sven Sager, akira@narux.de -->
<Project version="5.1"> <Project version="5.1">
<Language>en_US</Language> <Language>en_US</Language>
<Hash>66103e2eaf8a762f14d1fd51d8b1c9dcaf35a275</Hash> <Hash>66103e2eaf8a762f14d1fd51d8b1c9dcaf35a275</Hash>
<ProgLanguage mixed="0">Python3</ProgLanguage> <ProgLanguage mixed="0">Python3</ProgLanguage>
<ProjectType>Console</ProjectType> <ProjectType>Console</ProjectType>
<Version>0.7.0</Version> <Version>0.7.1</Version>
<Author>Sven Sager</Author> <Author>Sven Sager</Author>
<Email>akira@narux.de</Email> <Email>akira@narux.de</Email>
<Eol index="1"/> <Eol index="1"/>

28
revpipycontrol/locale/de/LC_MESSAGES/revpipycontrol.po
View File

@@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: RevPiPyControl 0.4.0\n" "Project-Id-Version: RevPiPyControl 0.4.0\n"
"POT-Creation-Date: 2018-10-07 11:51+0200\n" "POT-Creation-Date: 2018-10-07 12:08+0200\n"
"PO-Revision-Date: 2018-10-07 12:00+0200\n" "PO-Revision-Date: 2018-10-07 12:08+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: de\n" "Language: de\n"
@@ -93,8 +93,8 @@ msgstr ""
"IP: {0} / Level: {1}" "IP: {0} / Level: {1}"
#: aclmanager.py:291 aclmanager.py:367 revpicheckclient.py:112 #: aclmanager.py:291 aclmanager.py:367 revpicheckclient.py:112
#: revpicheckclient.py:335 revpicheckclient.py:460 revpidevelop.py:209 #: revpicheckclient.py:335 revpicheckclient.py:460 revpidevelop.py:216
#: revpidevelop.py:217 revpidevelop.py:244 revpilegacy.py:318 #: revpidevelop.py:224 revpidevelop.py:252 revpilegacy.py:318
#: revpioption.py:115 revpioption.py:436 revpiplclist.py:227 #: revpioption.py:115 revpioption.py:436 revpiplclist.py:227
#: revpiprogram.py:329 revpiprogram.py:360 revpiprogram.py:423 #: revpiprogram.py:329 revpiprogram.py:360 revpiprogram.py:423
#: revpiprogram.py:429 revpiprogram.py:435 revpiprogram.py:443 #: revpiprogram.py:429 revpiprogram.py:435 revpiprogram.py:443
@@ -246,7 +246,7 @@ msgstr "Aktualisiere Werte automatisch"
msgid "Write values to RevPi" msgid "Write values to RevPi"
msgstr "Schreibe Werte auf 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:255 revpipycontrol.py:304 revpipycontrol.py:338
#: revpipycontrol.py:356 revpipycontrol.py:389 #: revpipycontrol.py:356 revpipycontrol.py:389
msgid "Warning" msgid "Warning"
@@ -291,12 +291,16 @@ msgstr "Pfad wählen"
msgid "Stop / Upload / Start" msgid "Stop / Upload / Start"
msgstr "Stoppen / Hochladen / Starten" 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 #: revpioption.py:428 revpiplclist.py:219 revpiprogram.py:97
msgid "Information" msgid "Information"
msgstr "Information" msgstr "Information"
#: revpidevelop.py:201 revpiprogram.py:98 #: revpidevelop.py:208 revpiprogram.py:98
msgid "" msgid ""
"A PLC program has been uploaded. Please check the PLC options to see if the " "A PLC program has been uploaded. Please check the PLC options to see if the "
"correct program is specified as the start program." "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 " "Ein PLC Programm wurde hochgeladen. Bitte prüfen Sie die PLC Optionen, ob "
"dort das richtige Programm als Startprogramm angegeben ist." "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." msgid "The Revolution Pi could not process some parts of the transmission."
msgstr "Der Revoluton Pi konnte Teile der Übertragung nicht verarbeiten." 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" msgid "Errors occurred during transmission"
msgstr "Bei der Übertragung traten Fehler auf" msgstr "Bei der Übertragung traten Fehler auf"
#: revpidevelop.py:229 #: revpidevelop.py:237
msgid "Directory to watch" msgid "Directory to watch"
msgstr "Ordner zum Überwachen" msgstr "Ordner zum Überwachen"
#: revpidevelop.py:245 #: revpidevelop.py:253
msgid "Can not open the selected folder." msgid "Can not open the selected folder."
msgstr "Kann gewählten Ordner nicht öffnen." msgstr "Kann gewählten Ordner nicht öffnen."
#: revpidevelop.py:277 #: revpidevelop.py:285
msgid "" msgid ""
"Found more than 1000 files! Only 1000 files can be shown in this dialog, all " "Found more than 1000 files! Only 1000 files can be shown in this dialog, all "
"other will be ignored." "other will be ignored."

14
revpipycontrol/revpidevelop.py
View File

@@ -152,13 +152,20 @@ class RevPiDevelop(ttk.Frame):
btnlist.grid(row=r, columnspan=2, sticky="we") btnlist.grid(row=r, columnspan=2, sticky="we")
self.btn_jobs = ttk.Button(btnlist) 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["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) self.btn_jobs.grid(row=0, column=1, **cpadwe)
def btn_domyjob(self): def btn_domyjob(self, stop_restart=True):
u"""Hochladen und neu starten.""" u"""Hochladen und neu starten.
@param stop_restart Bestehendes Programm Beenden/Starten"""
if stop_restart:
# PLC Programm anhalten # PLC Programm anhalten
self.xmlcli.plcstop() self.xmlcli.plcstop()
@@ -219,6 +226,7 @@ class RevPiDevelop(ttk.Frame):
parent=self.master parent=self.master
) )
if stop_restart:
# PLC Programm starten # PLC Programm starten
self.xmlcli.plcstart() self.xmlcli.plcstart()

2
revpipycontrol/revpipycontrol.py
View File

@@ -5,7 +5,7 @@ u"""RevPiPyControl main program."""
__author__ = "Sven Sager" __author__ = "Sven Sager"
__copyright__ = "Copyright (C) 2018 Sven Sager" __copyright__ = "Copyright (C) 2018 Sven Sager"
__license__ = "GPLv3" __license__ = "GPLv3"
__version__ = "0.7.0" __version__ = "0.7.1"
import revpicheckclient import revpicheckclient
import revpidevelop import revpidevelop

2
setup.py
View File

@@ -23,7 +23,7 @@ globsetup = {
"author_email": "akira@narux.de", "author_email": "akira@narux.de",
"url": "https://revpimodio.org/revpipyplc/", "url": "https://revpimodio.org/revpipyplc/",
"license": "LGPLv3", "license": "LGPLv3",
"version": "0.7.0", "version": "0.7.1",
"name": "revpipycontrol", "name": "revpipycontrol",