diff --git a/MANIFEST.in b/MANIFEST.in index f1b5621..36c28a0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ include MANIFEST.in +include stdeb.cfg recursive-include data * recursive-include revpipycontrol * global-exclude *.pyc diff --git a/revpipycontrol.e4p b/revpipycontrol.e4p index 74ed6ea..93b05f6 100644 --- a/revpipycontrol.e4p +++ b/revpipycontrol.e4p @@ -1,7 +1,7 @@ - + en_US @@ -9,7 +9,7 @@ Python3 Console - 0.2.6 + 0.2.7 Sven Sager akira@narux.de diff --git a/revpipycontrol/revpioption.py b/revpipycontrol/revpioption.py index 0d529b3..68dce00 100644 --- a/revpipycontrol/revpioption.py +++ b/revpipycontrol/revpioption.py @@ -76,6 +76,7 @@ class RevPiOption(tkinter.Frame): self.var_pythonver = tkinter.IntVar(prog) self.var_startpy = tkinter.StringVar(prog) + self.var_startargs = tkinter.StringVar(prog) self.var_slave = tkinter.BooleanVar(prog) self.var_pythonver.set(3) @@ -109,6 +110,14 @@ class RevPiOption(tkinter.Frame): opt_startpy["state"] = self.xmlstate opt_startpy.grid(columnspan=2, **cpadwe) + lbl = tkinter.Label(prog) + lbl["text"] = "Programm Argumente" + lbl.grid(columnspan=2, **cpadw) + + txt = tkinter.Entry(prog) + txt["textvariable"] = self.var_startargs + txt.grid(columnspan=2, **cpadw) + ckb_slave = tkinter.Checkbutton(prog, justify="left") ckb_slave["state"] = self.xmlstate ckb_slave["text"] = "RevPi als PLC-Slave verwenden" @@ -175,20 +184,21 @@ class RevPiOption(tkinter.Frame): def _loadappdata(self): dc = self.xmlcli.get_config() - self.var_start.set(dc["autostart"]) - self.var_reload.set(dc["autoreload"]) - self.var_zexit.set(dc["zeroonexit"]) - self.var_zerr.set(dc["zeroonerror"]) + self.var_start.set(dc.get("autostart", "1")) + self.var_reload.set(dc.get("autoreload", "1")) + self.var_zexit.set(dc.get("zeroonexit", "0")) + self.var_zerr.set(dc.get("zeroonerror", "0")) - self.var_startpy.set(dc["plcprogram"]) - self.var_pythonver.set(dc["pythonversion"]) - self.var_slave.set(dc["plcslave"]) + self.var_startpy.set(dc.get("plcprogram", "none.py")) + self.var_startargs.set(dc.get("plcarguments", "")) + self.var_pythonver.set(dc.get("pythonversion", "3")) + self.var_slave.set(dc.get("plcslave", "0")) - self.var_xmlon.set(dc["xmlrpc"] >= 1) - self.var_xmlmod2.set(dc["xmlrpc"] >= 2) - self.var_xmlmod3.set(dc["xmlrpc"] >= 3) + self.var_xmlon.set(dc.get("xmlrpc", 0) >= 1) + self.var_xmlmod2.set(dc.get("xmlrpc", 0) >= 2) + self.var_xmlmod3.set(dc.get("xmlrpc", 0) >= 3) - self.var_xmlport.set(dc["xmlrpcport"]) + self.var_xmlport.set(dc.get("xmlrpcport", "55123")) def _setappdata(self): dc = {} @@ -198,6 +208,7 @@ class RevPiOption(tkinter.Frame): dc["zeroonerror"] = int(self.var_zerr.get()) dc["plcprogram"] = self.var_startpy.get() + dc["plcarguments"] = self.var_startargs.get() dc["pythonversion"] = self.var_pythonver.get() dc["plcslave"] = int(self.var_slave.get()) diff --git a/revpipycontrol/revpipycontrol.py b/revpipycontrol/revpipycontrol.py index 91f01a0..e81d6d2 100755 --- a/revpipycontrol/revpipycontrol.py +++ b/revpipycontrol/revpipycontrol.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # # RevPiPyControl -# Version: 0.2.6 +# Version: 0.2.7 # # Webpage: https://revpimodio.org/revpipyplc/ # (c) Sven Sager, License: LGPLv3 @@ -20,8 +20,6 @@ from os.path import dirname from os.path import join as pathjoin from xmlrpc.client import ServerProxy -socket.setdefaulttimeout(2) - def addroot(filename): u"""Hängt root-dir der Anwendung vor Dateinamen. @@ -143,6 +141,7 @@ class RevPiPyControl(tkinter.Frame): ) def _opt_conn(self, text): + socket.setdefaulttimeout(2) sp = ServerProxy( "http://{}:{}".format( self.dict_conn[text][0], int(self.dict_conn[text][1]) diff --git a/setup.py b/setup.py index 59e732a..6f90cf5 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.2.6", + "version": "0.2.7", "name": "revpipycontrol", diff --git a/stdeb.cfg b/stdeb.cfg new file mode 100644 index 0000000..66b7628 --- /dev/null +++ b/stdeb.cfg @@ -0,0 +1,5 @@ +[DEFAULT] +Debian-Version=1 +Depends3=python3-tk +Section=universe/x11 +Suite=stable