1
0
mirror of https://github.com/naruxde/revpipycontrol.git synced 2025-11-08 23:53:52 +01:00

Fehlermeldung angepasst, wenn ACL f?r Verbindungs-IP nicht gesetzt ist

This commit is contained in:
2018-04-07 14:57:04 +02:00
parent 3c05f9f024
commit 56cf5a7b09
5 changed files with 38 additions and 182 deletions

View File

@@ -1,150 +0,0 @@
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)

View File

@@ -1,8 +0,0 @@
AclManager ttk.Frame
RevPiCheckClient tkinter.Frame
RevPiInfo tkinter.Frame
RevPiLogfile tkinter.Frame
RevPiOption tkinter.Frame
RevPiPlcList tkinter.Frame
RevPiProgram tkinter.Frame
RevPiPyControl tkinter.Frame

View File

@@ -1,7 +1,7 @@
<?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-04-07, 14:23:09 --> <!-- Saved: 2018-04-07, 14:53:30 -->
<!-- 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>
@@ -35,7 +35,6 @@
<Others> <Others>
<Other>data</Other> <Other>data</Other>
<Other>doc</Other> <Other>doc</Other>
<Other>revpipycontrol.api</Other>
<Other>stdeb.cfg</Other> <Other>stdeb.cfg</Other>
<Other>eric-revpipycontrol.api</Other> <Other>eric-revpipycontrol.api</Other>
</Others> </Others>

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-04-07 13:40+0200\n" "POT-Creation-Date: 2018-04-07 14:56+0200\n"
"PO-Revision-Date: 2018-04-07 13:54+0200\n" "PO-Revision-Date: 2018-04-07 14:56+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: de\n" "Language: de\n"
@@ -19,8 +19,8 @@ msgstr ""
msgid "Level" msgid "Level"
msgstr "Level" msgstr "Level"
#: aclmanager.py:77 aclmanager.py:277 revpilegacy.py:69 revpilegacy.py:281 #: aclmanager.py:77 aclmanager.py:277 revpilegacy.py:69 revpilegacy.py:282
#: revpilegacy.py:328 revpioption.py:73 revpioption.py:318 revpioption.py:362 #: revpilegacy.py:329 revpioption.py:73 revpioption.py:312 revpioption.py:356
#: revpiplclist.py:61 revpiplclist.py:197 revpiprogram.py:394 #: revpiplclist.py:61 revpiplclist.py:197 revpiprogram.py:394
#: revpiprogram.py:468 #: revpiprogram.py:468
msgid "Question" msgid "Question"
@@ -90,8 +90,8 @@ msgstr ""
"IP: {} / Level: {}" "IP: {} / Level: {}"
#: aclmanager.py:292 aclmanager.py:368 revpicheckclient.py:110 #: aclmanager.py:292 aclmanager.py:368 revpicheckclient.py:110
#: revpicheckclient.py:442 revpilegacy.py:318 revpioption.py:87 #: revpicheckclient.py:442 revpilegacy.py:319 revpioption.py:87
#: revpioption.py:352 revpiplclist.py:221 revpiprogram.py:330 #: revpioption.py:346 revpiplclist.py:221 revpiprogram.py:330
#: revpiprogram.py:361 revpiprogram.py:424 revpiprogram.py:430 #: revpiprogram.py:361 revpiprogram.py:424 revpiprogram.py:430
#: revpiprogram.py:436 revpiprogram.py:444 revpiprogram.py:450 #: revpiprogram.py:436 revpiprogram.py:444 revpiprogram.py:450
#: revpiprogram.py:483 revpiprogram.py:567 revpiprogram.py:640 #: revpiprogram.py:483 revpiprogram.py:567 revpiprogram.py:640
@@ -285,7 +285,7 @@ msgstr ""
msgid "XML-RPC server port" msgid "XML-RPC server port"
msgstr "XML-RPC Serverport" msgstr "XML-RPC Serverport"
#: revpilegacy.py:274 revpilegacy.py:310 revpioption.py:300 revpioption.py:344 #: revpilegacy.py:274 revpilegacy.py:311 revpioption.py:300 revpioption.py:338
#: revpiplclist.py:213 revpiprogram.py:98 #: revpiplclist.py:213 revpiprogram.py:98
msgid "Information" msgid "Information"
msgstr "Information" msgstr "Information"
@@ -294,7 +294,7 @@ msgstr "Information"
msgid "You have not made any changes to save." msgid "You have not made any changes to save."
msgstr "Sie haben keine Änderungen zum Speichern vorgenommen." msgstr "Sie haben keine Änderungen zum Speichern vorgenommen."
#: revpilegacy.py:282 #: revpilegacy.py:283
msgid "" msgid ""
"The settings are now saved on the Revolution Pi. \n" "The settings are now saved on the Revolution Pi. \n"
"\n" "\n"
@@ -306,17 +306,17 @@ msgstr ""
"Sollen die neuen Einstellungen sofort in Kraft treten? \n" "Sollen die neuen Einstellungen sofort in Kraft treten? \n"
"Dies bedeutet einen Neustart des Dienstes und des laufenden PLC-Programms!" "Dies bedeutet einen Neustart des Dienstes und des laufenden PLC-Programms!"
#: revpilegacy.py:311 revpioption.py:345 #: revpilegacy.py:312 revpioption.py:339
msgid "Settings saved" msgid "Settings saved"
msgstr "Einstellungen gespeichert" msgstr "Einstellungen gespeichert"
#: revpilegacy.py:319 revpioption.py:353 #: revpilegacy.py:320 revpioption.py:347
msgid "The settings could not be saved. This can happen if values are wrong!" msgid "The settings could not be saved. This can happen if values are wrong!"
msgstr "" msgstr ""
"Die Einstellungen konnten nicht gesichert werden. Dies kann passieren, wenn " "Die Einstellungen konnten nicht gesichert werden. Dies kann passieren, wenn "
"Werte falsch sind!" "Werte falsch sind!"
#: revpilegacy.py:329 revpioption.py:363 #: revpilegacy.py:330 revpioption.py:357
msgid "" msgid ""
"Are you sure you want to deactivate the XML-RPC server? You will NOT be able " "Are you sure you want to deactivate the XML-RPC server? You will NOT be able "
"to access the Revolution Pi with this program." "to access the Revolution Pi with this program."
@@ -372,7 +372,7 @@ msgstr "läuft"
msgid "stopped" msgid "stopped"
msgstr "beendet" msgstr "beendet"
#: revpioption.py:319 #: revpioption.py:313
msgid "" msgid ""
"The settings will be set on the Revolution Pi now. \n" "The settings will be set on the Revolution Pi now. \n"
"\n" "\n"
@@ -386,31 +386,31 @@ msgstr ""
"Programm jetzt neu starten!\n" "Programm jetzt neu starten!\n"
"ACL Änderungen und Diensteinstellungen werden sofort angewandt." "ACL Änderungen und Diensteinstellungen werden sofort angewandt."
#: revpioption.py:382 #: revpioption.py:376
msgid "read only" msgid "read only"
msgstr "nur lesen" msgstr "nur lesen"
#: revpioption.py:383 #: revpioption.py:377
msgid "read and write" msgid "read and write"
msgstr "lesen und schreiben" msgstr "lesen und schreiben"
#: revpioption.py:399 #: revpioption.py:393
msgid "Start/Stop PLC program and read logs" msgid "Start/Stop PLC program and read logs"
msgstr "PLC Programm starten/stoppen und Logs lesen" msgstr "PLC Programm starten/stoppen und Logs lesen"
#: revpioption.py:400 #: revpioption.py:394
msgid "+ read IOs in watch modus" msgid "+ read IOs in watch modus"
msgstr "+ IOs in 'Watch modus' lesen" msgstr "+ IOs in 'Watch modus' lesen"
#: revpioption.py:401 #: revpioption.py:395
msgid "+ read properties and download PLC program" msgid "+ read properties and download PLC program"
msgstr "+ Einstellungen lesen und PLC Programm herunterladen" msgstr "+ Einstellungen lesen und PLC Programm herunterladen"
#: revpioption.py:402 #: revpioption.py:396
msgid "+ upload PLC program" msgid "+ upload PLC program"
msgstr "+ PLC Programm hochladen" msgstr "+ PLC Programm hochladen"
#: revpioption.py:403 #: revpioption.py:397
msgid "+ set properties" msgid "+ set properties"
msgstr "+ Einstellungen ändern" msgstr "+ Einstellungen ändern"
@@ -801,8 +801,20 @@ msgstr ""
"diesen Dialog zu verwenden!" "diesen Dialog zu verwenden!"
#: revpipycontrol.py:391 #: revpipycontrol.py:391
msgid "Can not reach server!" msgid ""
msgstr "Server ist nicht erreichbar!" "Can not connect to RevPi XML-RPC Service! \n"
"\n"
"This could have the following reasons: The RevPi is not online, the XML-RPC "
"service is not running or the ACL permission is not set for your IP!!!"
msgstr ""
"Kann keine Verbindung zum RevPi XML-RPC Dienst herstellen!\n"
"\n"
"Das könnte folgende Gründe haben: Der RevPi ist nicht online, der XML-RPC "
"Dienst läuft nicht oder die ACL Zugriffsberechtigung ist für diese IP nicht "
"gesetzt!!!"
#~ msgid "Can not reach server!"
#~ msgstr "Server ist nicht erreichbar!"
#~ msgid "" #~ msgid ""
#~ "Set process image to NULL if program\n" #~ "Set process image to NULL if program\n"

View File

@@ -388,7 +388,10 @@ class RevPiPyControl(tkinter.Frame):
self.serverdisconnect() self.serverdisconnect()
tkmsg.showerror( tkmsg.showerror(
_("Error"), _("Error"),
_("Can not reach server!"), _("Can not connect to RevPi XML-RPC Service! \n\n"
"This could have the following reasons: The RevPi is not "
"online, the XML-RPC service is not running or the ACL "
"permission is not set for your IP!!!"),
parent=self.master parent=self.master
) )