diff --git a/eric-revpipycontrol.api b/eric-revpipycontrol.api new file mode 100644 index 0000000..35d2dd1 --- /dev/null +++ b/eric-revpipycontrol.api @@ -0,0 +1,150 @@ +aclmanager.AclManager.__get_acltext?6() +aclmanager.AclManager.__set_acltext?6(value) +aclmanager.AclManager._ask_delete?5() +aclmanager.AclManager._changesdone?5() +aclmanager.AclManager._checkback?5(event, tkvar, pretxt) +aclmanager.AclManager._checkclose?5(event=None) +aclmanager.AclManager._checkdot?5(event, tkvar, nexttxt) +aclmanager.AclManager._clearfields?5() +aclmanager.AclManager._createwidgets?5() +aclmanager.AclManager._loadfields?5() +aclmanager.AclManager._refreshacls?5() +aclmanager.AclManager._save?5() +aclmanager.AclManager._savefields?5() +aclmanager.AclManager._status_editremove?5(tkevt) +aclmanager.AclManager.acl?7 +aclmanager.AclManager.acltext?7 +aclmanager.AclManager.get_acl?4() +aclmanager.AclManager.root?7 +aclmanager.AclManager?1(master, minlevel, maxlevel, acl_str="", readonly=False) +aclmanager._?8 +mytools.addroot?4(filename) +mytools.gettrans?4(proglang=None) +mytools.savefile_connections?7 +mytools.savefile_programpath?7 +revpicheckclient.RevPiCheckClient.__chval?6(device, io, event=None) +revpicheckclient.RevPiCheckClient.__hidewin?6(win, event=None) +revpicheckclient.RevPiCheckClient.__saveoldvalue?6(event, tkvar) +revpicheckclient.RevPiCheckClient.__showwin?6(win) +revpicheckclient.RevPiCheckClient.__spinboxkey?6(device, io, event=None) +revpicheckclient.RevPiCheckClient._createiogroup?5(device, frame, iotype) +revpicheckclient.RevPiCheckClient._createwidgets?5() +revpicheckclient.RevPiCheckClient._onfrmconf?5(canvas) +revpicheckclient.RevPiCheckClient._warnwrite?5() +revpicheckclient.RevPiCheckClient._workvalues?5(io_dicts=None, writeout=False) +revpicheckclient.RevPiCheckClient.hideallwindows?4() +revpicheckclient.RevPiCheckClient.maxint?4(bytelen) +revpicheckclient.RevPiCheckClient.readvalues?4() +revpicheckclient.RevPiCheckClient.refreshvalues?4() +revpicheckclient.RevPiCheckClient.tmr_workvalues?4() +revpicheckclient.RevPiCheckClient.toggleauto?4() +revpicheckclient.RevPiCheckClient.togglewrite?4() +revpicheckclient.RevPiCheckClient.validatereturn?4(returnlist) +revpicheckclient.RevPiCheckClient.writevalues?4() +revpicheckclient.RevPiCheckClient?1(master, xmlcli, xmlmode=0) +revpicheckclient._?8 +revpiinfo.RevPiInfo._checkclose?5(event=None) +revpiinfo.RevPiInfo._createwidgets?5(extended=False) +revpiinfo.RevPiInfo.visitwebsite?4(event=None) +revpiinfo.RevPiInfo?1(master, xmlcli, version) +revpiinfo._?8 +revpilegacy.RevPiOption._changesdone?5() +revpilegacy.RevPiOption._checkclose?5(event=None) +revpilegacy.RevPiOption._createwidgets?5() +revpilegacy.RevPiOption._loadappdata?5(refresh=False) +revpilegacy.RevPiOption._setappdata?5() +revpilegacy.RevPiOption.askxmlon?4() +revpilegacy.RevPiOption.xmlmod2_tail?4() +revpilegacy.RevPiOption.xmlmod_tail?4() +revpilegacy.RevPiOption?1(master, xmlcli) +revpilegacy._?8 +revpilogfile.RevPiLogfile._checkclose?5(event=None) +revpilogfile.RevPiLogfile._createwidgets?5() +revpilogfile.RevPiLogfile._load_log?5(textwidget, xmlcall, startposition, full) +revpilogfile.RevPiLogfile.btn_clearapp?4() +revpilogfile.RevPiLogfile.btn_clearplc?4() +revpilogfile.RevPiLogfile.get_applog?4(full=False) +revpilogfile.RevPiLogfile.get_plclog?4(full=False) +revpilogfile.RevPiLogfile?1(master, xmlcli) +revpilogfile._?8 +revpioption.RevPiOption._changesdone?5() +revpioption.RevPiOption._checkclose?5(event=None) +revpioption.RevPiOption._checkvalues?5() +revpioption.RevPiOption._createwidgets?5() +revpioption.RevPiOption._loadappdata?5(refresh=False) +revpioption.RevPiOption._setappdata?5() +revpioption.RevPiOption.askxmlon?4() +revpioption.RevPiOption.btn_slaveacl?4() +revpioption.RevPiOption.btn_xmlacl?4() +revpioption.RevPiOption?1(master, xmlcli) +revpioption._?8 +revpiplclist.RevPiPlcList._checkclose?5(event=None) +revpiplclist.RevPiPlcList._createwidgets?5() +revpiplclist.RevPiPlcList._saveappdata?5() +revpiplclist.RevPiPlcList.build_listconn?4() +revpiplclist.RevPiPlcList.evt_btnadd?4() +revpiplclist.RevPiPlcList.evt_btnnew?4() +revpiplclist.RevPiPlcList.evt_btnremove?4() +revpiplclist.RevPiPlcList.evt_btnsave?4() +revpiplclist.RevPiPlcList.evt_keypress?4(evt=None) +revpiplclist.RevPiPlcList.evt_listconn?4(evt=None) +revpiplclist.RevPiPlcList.myapp?7 +revpiplclist.RevPiPlcList.root?7 +revpiplclist.RevPiPlcList?1(master) +revpiplclist._?8 +revpiplclist.get_connections?4() +revpiprogram.RevPiProgram._checkclose?5(event=None) +revpiprogram.RevPiProgram._createwidgets?5() +revpiprogram.RevPiProgram._evt_optdown?5(text="") +revpiprogram.RevPiProgram._evt_optup?5(text="") +revpiprogram.RevPiProgram.check_replacedir?4(rootdir) +revpiprogram.RevPiProgram.create_filelist?4(rootdir) +revpiprogram.RevPiProgram.getpictoryrsc?4() +revpiprogram.RevPiProgram.getprocimg?4() +revpiprogram.RevPiProgram.picontrolreset?4() +revpiprogram.RevPiProgram.plcdownload?4() +revpiprogram.RevPiProgram.plcupload?4() +revpiprogram.RevPiProgram.setpictoryrsc?4(filename=None) +revpiprogram.RevPiProgram?1(master, xmlcli, xmlmode, revpi) +revpiprogram._?8 +revpiprogram._loaddefaults?5(revpiname=None) +revpiprogram._savedefaults?5(revpiname, settings) +revpipycontrol.RevPiPyControl._btnstate?5() +revpipycontrol.RevPiPyControl._closeall?5() +revpipycontrol.RevPiPyControl._closeapp?5(event=None) +revpipycontrol.RevPiPyControl._createwidgets?5() +revpipycontrol.RevPiPyControl._fillconnbar?5() +revpipycontrol.RevPiPyControl._fillmbar?5() +revpipycontrol.RevPiPyControl._opt_conn?5(text, reconnect=False) +revpipycontrol.RevPiPyControl.infowindow?4() +revpipycontrol.RevPiPyControl.myapp?7 +revpipycontrol.RevPiPyControl.plcdebug?4() +revpipycontrol.RevPiPyControl.plclist?4() +revpipycontrol.RevPiPyControl.plclogs?4() +revpipycontrol.RevPiPyControl.plcoptions?4() +revpipycontrol.RevPiPyControl.plcprogram?4() +revpipycontrol.RevPiPyControl.plcrestart?4() +revpipycontrol.RevPiPyControl.plcstart?4() +revpipycontrol.RevPiPyControl.plcstop?4() +revpipycontrol.RevPiPyControl.root?7 +revpipycontrol.RevPiPyControl.serverdisconnect?4() +revpipycontrol.RevPiPyControl.servererror?4() +revpipycontrol.RevPiPyControl.tmr_plcrunning?4() +revpipycontrol.RevPiPyControl.visitwebsite?4() +revpipycontrol.RevPiPyControl?1(master=None) +revpipycontrol._?8 +revpipycontrol.pycontrolversion?7 +revpipycontrol.shared.ipaclmanager.IpAclManager.__get_acl?6() +revpipycontrol.shared.ipaclmanager.IpAclManager.__get_filename?6() +revpipycontrol.shared.ipaclmanager.IpAclManager.__get_regex_acl?6() +revpipycontrol.shared.ipaclmanager.IpAclManager.__iter__?6() +revpipycontrol.shared.ipaclmanager.IpAclManager.__set_acl?6(value) +revpipycontrol.shared.ipaclmanager.IpAclManager.acl?7 +revpipycontrol.shared.ipaclmanager.IpAclManager.filename?7 +revpipycontrol.shared.ipaclmanager.IpAclManager.get_acllevel?4(ipaddress) +revpipycontrol.shared.ipaclmanager.IpAclManager.loadacl?4(str_acl) +revpipycontrol.shared.ipaclmanager.IpAclManager.loadaclfile?4(filename) +revpipycontrol.shared.ipaclmanager.IpAclManager.regex_acl?7 +revpipycontrol.shared.ipaclmanager.IpAclManager.writeaclfile?4(filename=None, aclname=None) +revpipycontrol.shared.ipaclmanager.IpAclManager?1(minlevel, maxlevel, acl=None) +revpipycontrol.shared.ipaclmanager.refullmatch?4(regex, string) diff --git a/eric-revpipycontrol.bas b/eric-revpipycontrol.bas new file mode 100644 index 0000000..7e6201d --- /dev/null +++ b/eric-revpipycontrol.bas @@ -0,0 +1,8 @@ +AclManager ttk.Frame +RevPiCheckClient tkinter.Frame +RevPiInfo tkinter.Frame +RevPiLogfile tkinter.Frame +RevPiOption tkinter.Frame +RevPiPlcList tkinter.Frame +RevPiProgram tkinter.Frame +RevPiPyControl tkinter.Frame diff --git a/revpipycontrol.e4p b/revpipycontrol.e4p index 11cb786..be4e094 100644 --- a/revpipycontrol.e4p +++ b/revpipycontrol.e4p @@ -1,7 +1,7 @@ - + en_US @@ -9,7 +9,7 @@ Python3 Console - 0.6.0 + 0.6.1 Sven Sager akira@narux.de @@ -37,6 +37,7 @@ doc revpipycontrol.api stdeb.cfg + eric-revpipycontrol.api revpipycontrol/revpipycontrol.py @@ -197,7 +198,7 @@ outputFile - revpipycontrol.api + eric-revpipycontrol.api useRecursion diff --git a/revpipycontrol/revpilegacy.py b/revpipycontrol/revpilegacy.py index 6c97f09..115b947 100644 --- a/revpipycontrol/revpilegacy.py +++ b/revpipycontrol/revpilegacy.py @@ -273,6 +273,7 @@ class RevPiOption(tkinter.Frame): tkmsg.showinfo( _("Information"), _("You have not made any changes to save."), + parent=self.master ) self._checkclose() return None diff --git a/revpipycontrol/revpioption.py b/revpipycontrol/revpioption.py index 4726293..963260a 100644 --- a/revpipycontrol/revpioption.py +++ b/revpipycontrol/revpioption.py @@ -299,6 +299,7 @@ class RevPiOption(tkinter.Frame): tkmsg.showinfo( _("Information"), _("You have not made any changes to save."), + parent=self.master ) self._checkclose() return None @@ -307,13 +308,6 @@ class RevPiOption(tkinter.Frame): if not self._checkvalues(): return None -# ask = tkmsg.askyesnocancel( -# _("Question"), -# _("The settings are now saved on the Revolution Pi. \n\n" -# "Should the new settings take effect immediately? \nThis " -# "means a restart of the service and the PLC program!"), -# parent=self.master -# ) ask = tkmsg.askokcancel( _("Question"), _("The settings will be set on the Revolution Pi now. \n\n" diff --git a/revpipycontrol/revpipycontrol.py b/revpipycontrol/revpipycontrol.py index cc6cea3..c89c912 100755 --- a/revpipycontrol/revpipycontrol.py +++ b/revpipycontrol/revpipycontrol.py @@ -25,7 +25,7 @@ from xmlrpc.client import ServerProxy # Übersetzung laden _ = gettrans() -pycontrolversion = "0.6.0" +pycontrolversion = "0.6.1" class RevPiPyControl(tkinter.Frame): diff --git a/setup.py b/setup.py index 5c40fb6..8a3062b 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ globsetup = { "author_email": "akira@narux.de", "url": "https://revpimodio.org/revpipyplc/", "license": "LGPLv3", - "version": "0.6.0", + "version": "0.6.1", "name": "revpipycontrol",