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

Bugfix for translations strings and format function

Browse Source
This commit is contained in:
Sven Sager
2021-04-15 16:09:03 +02:00
parent 9f8409f375
commit 2341e2be95
20 changed files with 1548 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/ui/aclmanager_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'aclmanager.ui' # Form implementation generated from reading ui file 'aclmanager.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

5
include/ui/avahisearch_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'avahisearch.ui' # Form implementation generated from reading ui file 'avahisearch.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

5
include/ui/debugcontrol_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'debugcontrol.ui' # Form implementation generated from reading ui file 'debugcontrol.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

5
include/ui/debugios_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'debugios.ui' # Form implementation generated from reading ui file 'debugios.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

9
include/ui/files_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'files.ui' # Form implementation generated from reading ui file 'files.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
@@ -56,6 +55,7 @@ class Ui_win_files(object):
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.lbl_path_local.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.lbl_path_local.sizePolicy().hasHeightForWidth())
self.lbl_path_local.setSizePolicy(sizePolicy) self.lbl_path_local.setSizePolicy(sizePolicy)
self.lbl_path_local.setText("/")
self.lbl_path_local.setObjectName("lbl_path_local") self.lbl_path_local.setObjectName("lbl_path_local")
self.gridLayout_2.addWidget(self.lbl_path_local, 1, 0, 1, 3) self.gridLayout_2.addWidget(self.lbl_path_local, 1, 0, 1, 3)
self.gridLayout_2.setColumnStretch(0, 1) self.gridLayout_2.setColumnStretch(0, 1)
@@ -98,6 +98,7 @@ class Ui_win_files(object):
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.lbl_path_revpi.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.lbl_path_revpi.sizePolicy().hasHeightForWidth())
self.lbl_path_revpi.setSizePolicy(sizePolicy) self.lbl_path_revpi.setSizePolicy(sizePolicy)
self.lbl_path_revpi.setText("/")
self.lbl_path_revpi.setObjectName("lbl_path_revpi") self.lbl_path_revpi.setObjectName("lbl_path_revpi")
self.gridLayout_3.addWidget(self.lbl_path_revpi, 1, 0, 1, 2) self.gridLayout_3.addWidget(self.lbl_path_revpi, 1, 0, 1, 2)
self.lbl_select_revpi = QtWidgets.QLabel(self.gb_select_revpi) self.lbl_select_revpi = QtWidgets.QLabel(self.gb_select_revpi)
@@ -162,11 +163,9 @@ class Ui_win_files(object):
self.btn_select_local.setToolTip(_translate("win_files", "Open developer root directory")) self.btn_select_local.setToolTip(_translate("win_files", "Open developer root directory"))
self.btn_refresh_local.setToolTip(_translate("win_files", "Reload file list")) self.btn_refresh_local.setToolTip(_translate("win_files", "Reload file list"))
self.lbl_path_local.setToolTip(_translate("win_files", "/")) self.lbl_path_local.setToolTip(_translate("win_files", "/"))
self.lbl_path_local.setText(_translate("win_files", "/"))
self.tree_files_local.setSortingEnabled(True) self.tree_files_local.setSortingEnabled(True)
self.gb_select_revpi.setTitle(_translate("win_files", "Revolution Pi")) self.gb_select_revpi.setTitle(_translate("win_files", "Revolution Pi"))
self.lbl_path_revpi.setToolTip(_translate("win_files", "/")) self.lbl_path_revpi.setToolTip(_translate("win_files", "/"))
self.lbl_path_revpi.setText(_translate("win_files", "/"))
self.lbl_select_revpi.setText(_translate("win_files", "RevPiPyLoad working directory:")) self.lbl_select_revpi.setText(_translate("win_files", "RevPiPyLoad working directory:"))
self.btn_refresh_revpi.setToolTip(_translate("win_files", "Reload file list")) self.btn_refresh_revpi.setToolTip(_translate("win_files", "Reload file list"))
self.tree_files_revpi.setSortingEnabled(True) self.tree_files_revpi.setSortingEnabled(True)

5
include/ui/mqttmanager_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'mqttmanager.ui' # Form implementation generated from reading ui file 'mqttmanager.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

2904
include/ui/ressources_rc.py
View File

File diff suppressed because it is too large Load Diff

5
include/ui/revpicommander_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'revpicommander.ui' # Form implementation generated from reading ui file 'revpicommander.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

5
include/ui/revpiinfo_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'revpiinfo.ui' # Form implementation generated from reading ui file 'revpiinfo.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

5
include/ui/revpilogfile_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'revpilogfile.ui' # Form implementation generated from reading ui file 'revpilogfile.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

5
include/ui/revpioption_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'revpioption.ui' # Form implementation generated from reading ui file 'revpioption.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

5
include/ui/revpiplclist_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'revpiplclist.ui' # Form implementation generated from reading ui file 'revpiplclist.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

5
include/ui/revpiprogram_ui.py
View File

@@ -2,10 +2,9 @@
# Form implementation generated from reading ui file 'revpiprogram.ui' # Form implementation generated from reading ui file 'revpiprogram.ui'
# #
# Created by: PyQt5 UI code generator 5.15.0 # Created by: PyQt5 UI code generator 5.14.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING! All changes made in this file will be lost!
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets

4
include/ui_dev/files.ui
View File

@@ -87,7 +87,7 @@
<string>/</string> <string>/</string>
</property> </property>
<property name="text"> <property name="text">
<string>/</string> <string notr="true">/</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -183,7 +183,7 @@
<string>/</string> <string>/</string>
</property> </property>
<property name="text"> <property name="text">
<string>/</string> <string notr="true">/</string>
</property> </property>
</widget> </widget>
</item> </item>

8
revpicommander/avahisearch.py
View File

@@ -128,8 +128,8 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
QtWidgets.QMessageBox.information( QtWidgets.QMessageBox.information(
self, self.tr("Already in list..."), self.tr( self, self.tr("Already in list..."), self.tr(
"The selected Revolution Pi is already saved in your " "The selected Revolution Pi is already saved in your "
"connection list as '{0}.".format(name) "connection list as '{0}'."
) ).format(name)
) )
helper.settings.endArray() helper.settings.endArray()
return i return i
@@ -149,8 +149,8 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
QtWidgets.QMessageBox.information( QtWidgets.QMessageBox.information(
self, self.tr("Success"), self.tr( self, self.tr("Success"), self.tr(
"The connection with the name '{0}' was successfully saved " "The connection with the name '{0}' was successfully saved "
"to folder '{1}' in your connections.".format(selected_name, folder_name) "to folder '{1}' in your connections."
) ).format(selected_name, folder_name)
) )
return i + 1 return i + 1

BIN
revpicommander/locale/revpicommander_de.qm
View File

Binary file not shown.

132
revpicommander/locale/revpicommander_de.ts
View File

@@ -68,37 +68,29 @@ Nicht gespeicherte Änderunen gehen verloren</translation>
<context> <context>
<name>AvahiSearch</name> <name>AvahiSearch</name>
<message> <message>
<location filename="../avahisearch.py" line="119"/> <location filename="../avahisearch.py" line="115"/>
<source>Auto discovered</source> <source>Auto discovered</source>
<translation>Automatisch erkannt</translation> <translation>Automatisch erkannt</translation>
</message> </message>
<message> <message>
<location filename="../avahisearch.py" line="132"/> <location filename="../avahisearch.py" line="128"/>
<source>Already in list...</source> <source>Already in list...</source>
<translation>Bereits in Liste...</translation> <translation>Bereits in Liste...</translation>
</message> </message>
<message> <message>
<location filename="../avahisearch.py" line="132"/> <location filename="../avahisearch.py" line="149"/>
<source>The selected Revolution Pi is already saved in your connection list as &apos;{0}.</source>
<translation>Der ausgewählte RevPi ist schon in der Verbindungsliste als &apos;{0}&apos;.</translation>
</message>
<message>
<location filename="../avahisearch.py" line="153"/>
<source>Success</source> <source>Success</source>
<translation>Erfolgreich</translation> <translation>Erfolgreich</translation>
</message> </message>
<message> <message>
<location filename="../avahisearch.py" line="153"/> <location filename="../avahisearch.py" line="149"/>
<source>The connection with the name &apos;{0}&apos; was successfully saved to folder &apos;{1}&apos; in your connections.</source> <source>The connection with the name &apos;{0}&apos; was successfully saved to folder &apos;{1}&apos; in your connections.</source>
<translation>Die Verbindung mit dem Namen &apos;{0}&apos; wurde erfolgreich im Ordner &apos;{1}&apos; gespeichert.</translation> <translation>Die Verbindung mit dem Namen &apos;{0}&apos; wurde erfolgreich im Ordner &apos;{1}&apos; gespeichert.</translation>
</message> </message>
</context>
<context>
<name>AvahiSearchThread</name>
<message> <message>
<location filename="../avahisearch.py" line="68"/> <location filename="../avahisearch.py" line="128"/>
<source>N/A</source> <source>The selected Revolution Pi is already saved in your connection list as &apos;{0}&apos;.</source>
<translation></translation> <translation>Der ausgewählte RevPi ist schon in der Verbindungsliste als &apos;{0}&apos;.</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -139,22 +131,22 @@ Nicht gespeicherte Änderunen gehen verloren</translation>
<context> <context>
<name>DebugIos</name> <name>DebugIos</name>
<message> <message>
<location filename="../debugios.py" line="212"/> <location filename="../debugios.py" line="213"/>
<source>signed</source> <source>signed</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../debugios.py" line="217"/> <location filename="../debugios.py" line="218"/>
<source>big_endian</source> <source>big_endian</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../debugios.py" line="206"/> <location filename="../debugios.py" line="207"/>
<source>as text</source> <source>as text</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../debugios.py" line="208"/> <location filename="../debugios.py" line="209"/>
<source>as number</source> <source>as number</source>
<translation></translation> <translation></translation>
</message> </message>
@@ -166,13 +158,6 @@ Nicht gespeicherte Änderunen gehen verloren</translation>
<source>Question</source> <source>Question</source>
<translation>Frage</translation> <translation>Frage</translation>
</message> </message>
<message>
<location filename="../mqttmanager.py" line="79"/>
<source>Do you really want to quit?
Unsaved changes will be lost!</source>
<translation type="obsolete">Soll das Fenster wirklich geschlossen werden?
Nicht gespeicherte Änderunen gehen verloren!</translation>
</message>
<message> <message>
<location filename="../mqttmanager.py" line="92"/> <location filename="../mqttmanager.py" line="92"/>
<source>Error</source> <source>Error</source>
@@ -209,117 +194,100 @@ Ungesicherte Änderungen gehen verloren.</translation>
<translation>Simulator gestartet...</translation> <translation>Simulator gestartet...</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="218"/> <location filename="../revpicommander.py" line="233"/>
<source>The simulator is running!
You can work with this simulator if your call RevPiModIO with this additional parameters:
procimg={procimg}
configrsc={config}
You can copy that from header textbox.</source>
<translation>Der Simulator läuft!
Du kannst mit der Simulation arbeiten, wenn du RevPiModIO mit diesen zusätzlichen Parametern instantiierst:
procimg={procimg}
configrsc={configrsc}
Dies kann aus der Textbox oben kopiert werden.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="235"/>
<source>Can not start...</source> <source>Can not start...</source>
<translation>Kann nicht gestartet werden...</translation> <translation>Kann nicht gestartet werden...</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="235"/> <location filename="../revpicommander.py" line="233"/>
<source>Can not start the simulator! Maybe the piCtory file is corrupt or you can not write to the location &apos;{0}&apos;.</source> <source>Can not start the simulator! Maybe the piCtory file is corrupt or you can not write to the location &apos;{0}&apos;.</source>
<translation>Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung in &apos;{0}`.</translation> <translation>Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung in &apos;{0}`.</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="435"/> <location filename="../revpicommander.py" line="432"/>
<source>Warning</source> <source>Warning</source>
<translation>Warnung</translation> <translation>Warnung</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="249"/> <location filename="../revpicommander.py" line="247"/>
<source>This version of Logviewer ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.4.1.</source> <source>This version of Logviewer ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.4.1.</source>
<translation>Diese Version vom Logbetrachter wird in RevPiPyLoad Version {0} nicht unterstützt! Es wird mindestens Version 0.4.1 benötigt.</translation> <translation>Diese Version vom Logbetrachter wird in RevPiPyLoad Version {0} nicht unterstützt! Es wird mindestens Version 0.4.1 benötigt.</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="300"/> <location filename="../revpicommander.py" line="297"/>
<source>XML-RPC access mode in the RevPiPyLoad configuration is too small to access this dialog!</source> <source>XML-RPC access mode in the RevPiPyLoad configuration is too small to access this dialog!</source>
<translation>XML-RPC Zugriffsberechtigung in der RevPiPyLoad Konfiguraiton ist zu klein für diese Einstellungen!</translation> <translation>XML-RPC Zugriffsberechtigung in der RevPiPyLoad Konfiguraiton ist zu klein für diese Einstellungen!</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="462"/> <location filename="../revpicommander.py" line="459"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="280"/> <location filename="../revpicommander.py" line="277"/>
<source>The Version of RevPiPyLoad on your Revolution Pi ({0}) is to old. This Version of RevPiCommander require at least version 0.6.0 of RevPiPyLoad. Please update your Revolution Pi!</source> <source>The Version of RevPiPyLoad on your Revolution Pi ({0}) is to old. This Version of RevPiCommander require at least version 0.6.0 of RevPiPyLoad. Please update your Revolution Pi!</source>
<translation>Die Version von RevPiPyLoad ({0}) auf dem Revolution Pi ist zu alt. Diese Version vom RevPiCommander braucht mindestens Version 0.6.0. Bitte aktualisiere deinen Revolution Pi!</translation> <translation>Die Version von RevPiPyLoad ({0}) auf dem Revolution Pi ist zu alt. Diese Version vom RevPiCommander braucht mindestens Version 0.6.0. Bitte aktualisiere deinen Revolution Pi!</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="333"/> <location filename="../revpicommander.py" line="330"/>
<source>Question</source> <source>Question</source>
<translation>Frage</translation> <translation>Frage</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="333"/> <location filename="../revpicommander.py" line="330"/>
<source>Are you sure to reset piControl? <source>Are you sure to reset piControl?
The pictory configuration will be reloaded. During that time the process image will be interrupted and could rise errors on running control programs!</source> The pictory configuration will be reloaded. During that time the process image will be interrupted and could rise errors on running control programs!</source>
<translation>Soll piControl wirklich zurückgesetzt werden? <translation>Soll piControl wirklich zurückgesetzt werden?
Die piCtory Konfiguration wird neu geladen. Das Prozessabbild wird in dieser Zeit nicht verfügbar sein und es könnten Fehler in Steuerungsprogrammen ausgelöst werden!</translation> Die piCtory Konfiguration wird neu geladen. Das Prozessabbild wird in dieser Zeit nicht verfügbar sein und es könnten Fehler in Steuerungsprogrammen ausgelöst werden!</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="346"/> <location filename="../revpicommander.py" line="343"/>
<source>Success</source> <source>Success</source>
<translation>Erfolgreich</translation> <translation>Erfolgreich</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="346"/> <location filename="../revpicommander.py" line="343"/>
<source>piControl reset executed successfully</source> <source>piControl reset executed successfully</source>
<translation>piControl wurde erfolgreich zurückgesetzt</translation> <translation>piControl wurde erfolgreich zurückgesetzt</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="353"/> <location filename="../revpicommander.py" line="350"/>
<source>piControl reset could not be executed successfully</source> <source>piControl reset could not be executed successfully</source>
<translation>piControl konnte nicht zurückgesetzt werden</translation> <translation>piControl konnte nicht zurückgesetzt werden</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="411"/> <location filename="../revpicommander.py" line="408"/>
<source>Reset to piCtory defaults...</source> <source>Reset to piCtory defaults...</source>
<translation>Standardwerte von piCtory laden...</translation> <translation>Standardwerte von piCtory laden...</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="411"/> <location filename="../revpicommander.py" line="408"/>
<source>Do you want to reset your process image to piCtory default values? <source>Do you want to reset your process image to piCtory default values?
You have to stop other RevPiModIO programs before doing that, because they could reset the outputs.</source> You have to stop other RevPiModIO programs before doing that, because they could reset the outputs.</source>
<translation>Soll das virtuelle Prozessabbild auf die piCtory Standardwerte zurückgesetzt werden? <translation>Soll das virtuelle Prozessabbild auf die piCtory Standardwerte zurückgesetzt werden?
Es sollten alle RevPiModIO Programme vorher beendet werden, da diese ihre IO Werte sofort wieder schreiben würden.</translation> Es sollten alle RevPiModIO Programme vorher beendet werden, da diese ihre IO Werte sofort wieder schreiben würden.</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="435"/> <location filename="../revpicommander.py" line="432"/>
<source>The watch mode ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.5.3! Maybe the python3-revpimodio2 module is not installed on your RevPi at least version 2.0.0.</source> <source>The watch mode ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.5.3! Maybe the python3-revpimodio2 module is not installed on your RevPi at least version 2.0.0.</source>
<translation>Der SPS Betrachter ist in Version {0} von RevPiPyLoad auf dem Rev Pi nicht unterstützt! Es muss mindestens Version 0.5.3 installiert sein! Vielleicht fehlt auch das python3-revpimodio2 Modul, welches mindestens Version 2.0.0 haben muss.</translation> <translation>Der SPS Betrachter ist in Version {0} von RevPiPyLoad auf dem Rev Pi nicht unterstützt! Es muss mindestens Version 0.5.3 installiert sein! Vielleicht fehlt auch das python3-revpimodio2 Modul, welches mindestens Version 2.0.0 haben muss.</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="447"/> <location filename="../revpicommander.py" line="444"/>
<source>Can not load this function, because your ACL level is to low! <source>Can not load this function, because your ACL level is to low!
You need at least level 1 to read or level 3 to write.</source> You need at least level 1 to read or level 3 to write.</source>
<translation>Für diese Funktion ist das Berechtigungslevel zu gering! <translation>Für diese Funktion ist das Berechtigungslevel zu gering!
Es muss mindestens Level 1 zum Lesen oder Level 3 zu Schreiben sein.</translation> Es muss mindestens Level 1 zum Lesen oder Level 3 zu Schreiben sein.</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="462"/> <location filename="../revpicommander.py" line="459"/>
<source>Can not load piCtory configuration. <source>Can not load piCtory configuration.
Did you create a hardware configuration? Please check this in piCtory!</source> Did you create a hardware configuration? Please check this in piCtory!</source>
<translation>Kann piCtory Konfiguration nicht laden. <translation>Kann piCtory Konfiguration nicht laden.
Wurde eine Hardwarekonfiguration in piCtory erzeugt?</translation> Wurde eine Hardwarekonfiguration in piCtory erzeugt?</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="368"/> <location filename="../revpicommander.py" line="365"/>
<source>Can not connect to RevPi XML-RPC Service! <source>Can not connect to RevPi XML-RPC Service!
This could have the following reasons: The RevPi is not online, the XML-RPC service is not running / bind to localhost or the ACL permission is not set for your IP!!! This could have the following reasons: The RevPi is not online, the XML-RPC service is not running / bind to localhost or the ACL permission is not set for your IP!!!
@@ -331,6 +299,23 @@ Das kann eine der folgenden Ursachen haben: Der Rev Pi ist nicht online, der XML
Führe &apos;sudo revpipyload_secure_installation&apos; auf dem Revolution Pi aus um diese Funktion zu konfigurieren!</translation> Führe &apos;sudo revpipyload_secure_installation&apos; auf dem Revolution Pi aus um diese Funktion zu konfigurieren!</translation>
</message> </message>
<message>
<location filename="../revpicommander.py" line="218"/>
<source>The simulator is running!
You can work with this simulator if your call RevPiModIO with this additional parameters:
procimg={0}
configrsc={1}
You can copy that from header textbox.</source>
<translation>Der Simulator läuft!
Du kannst mit der Simulation arbeiten, wenn du RevPiModIO mit diesen zusätzlichen Parametern instantiierst:
procimg={0}
configrsc={1}
Dies kann aus der Textbox oben kopiert werden.</translation>
</message>
</context> </context>
<context> <context>
<name>RevPiFiles</name> <name>RevPiFiles</name>
@@ -349,11 +334,6 @@ Führe &apos;sudo revpipyload_secure_installation&apos; auf dem Revolution Pi au
<source>Can not stop plc program on Revolution Pi.</source> <source>Can not stop plc program on Revolution Pi.</source>
<translation>Kann SPS Programm auf Rev Pi nicht stoppen.</translation> <translation>Kann SPS Programm auf Rev Pi nicht stoppen.</translation>
</message> </message>
<message>
<location filename="../revpifiles.py" line="110"/>
<source>Information...</source>
<translation type="obsolete">Information...</translation>
</message>
<message> <message>
<location filename="../revpifiles.py" line="119"/> <location filename="../revpifiles.py" line="119"/>
<source>The Revolution Pi could not process some parts of the transmission.</source> <source>The Revolution Pi could not process some parts of the transmission.</source>
@@ -480,7 +460,7 @@ Wählen Sie &apos;Ja&apos; zum Überschreiben, &apos;Nein&apos; um nur fehlende
<context> <context>
<name>RevPiLogfile</name> <name>RevPiLogfile</name>
<message> <message>
<location filename="../revpilogfile.py" line="201"/> <location filename="../revpilogfile.py" line="200"/>
<source>Can not access log file on the RevPi</source> <source>Can not access log file on the RevPi</source>
<translation>Kann auf Logbuch vom RevPi nicht zugreifen</translation> <translation>Kann auf Logbuch vom RevPi nicht zugreifen</translation>
</message> </message>
@@ -599,7 +579,7 @@ Ungesicherte Änderungen gehen verloren.</translation>
<context> <context>
<name>RevPiProgram</name> <name>RevPiProgram</name>
<message> <message>
<location filename="../revpiprogram.py" line="689"/> <location filename="../revpiprogram.py" line="688"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
@@ -656,7 +636,7 @@ Please try again.</source>
Versuche es erneut.</translation> Versuche es erneut.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="699"/> <location filename="../revpiprogram.py" line="698"/>
<source>Success</source> <source>Success</source>
<translation>Erfolgreich</translation> <translation>Erfolgreich</translation>
</message> </message>
@@ -824,7 +804,7 @@ Dies ist kein Fehler, wenn das SPS Startprogramm bereits auf dem Rev Pi ist. Pr
<translation>piCtory Datei speichern...</translation> <translation>piCtory Datei speichern...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="647"/> <location filename="../revpiprogram.py" line="646"/>
<source>piCtory file (*.rsc);;All files (*.*)</source> <source>piCtory file (*.rsc);;All files (*.*)</source>
<translation>piCtory Datei (*.rsc);;Alle Dateien (*.*)</translation> <translation>piCtory Datei (*.rsc);;Alle Dateien (*.*)</translation>
</message> </message>
@@ -841,27 +821,27 @@ Dies ist kein Fehler, wenn das SPS Startprogramm bereits auf dem Rev Pi ist. Pr
{0}.</translation> {0}.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="647"/> <location filename="../revpiprogram.py" line="646"/>
<source>Upload piCtory file...</source> <source>Upload piCtory file...</source>
<translation>piCtory datei hochladen...</translation> <translation>piCtory datei hochladen...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="668"/> <location filename="../revpiprogram.py" line="667"/>
<source>Save piControl file...</source> <source>Save piControl file...</source>
<translation>piCtory Datei speichern...</translation> <translation>piCtory Datei speichern...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="668"/> <location filename="../revpiprogram.py" line="667"/>
<source>Process image file (*.img);;All files (*.*)</source> <source>Process image file (*.img);;All files (*.*)</source>
<translation>Processabbild (*.img);;Alle Dateien (*.*)</translation> <translation>Processabbild (*.img);;Alle Dateien (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="689"/> <location filename="../revpiprogram.py" line="688"/>
<source>Could not load process image from Revolution Pi.</source> <source>Could not load process image from Revolution Pi.</source>
<translation>Kann Prozessabbild von Revolution Pi nicht laden.</translation> <translation>Kann Prozessabbild von Revolution Pi nicht laden.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="699"/> <location filename="../revpiprogram.py" line="698"/>
<source>Process image successfully loaded and saved to: <source>Process image successfully loaded and saved to:
{0}.</source> {0}.</source>
<translation>Prozessabbild erfolgreich geladen und gespeichert als: <translation>Prozessabbild erfolgreich geladen und gespeichert als:
@@ -1506,7 +1486,7 @@ applicable law.
<translation>Dateiliste neu laden</translation> <translation>Dateiliste neu laden</translation>
</message> </message>
<message> <message>
<location filename="../../include/ui_dev/files.ui" line="186"/> <location filename="../../include/ui_dev/files.ui" line="183"/>
<source>/</source> <source>/</source>
<translation></translation> <translation></translation>
</message> </message>

5
revpicommander/proginit.py
View File

@@ -85,11 +85,6 @@ parser = ArgumentParser(
prog=programname, prog=programname,
description="Program description" description="Program description"
) )
# parser.add_argument(
# "-c", "--conffile", dest="conffile",
# default="{0}.conf".format(programname),
# help="Application configuration file"
# )
parser.add_argument( parser.add_argument(
"-f", "--logfile", dest="logfile", "-f", "--logfile", dest="logfile",
help="Save log entries to this file" help="Save log entries to this file"

15
revpicommander/revpicommander.py
View File

@@ -218,13 +218,11 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
QtWidgets.QMessageBox.information( QtWidgets.QMessageBox.information(
self, self.tr("Simulator started..."), self.tr( self, self.tr("Simulator started..."), self.tr(
"The simulator is running!\n\nYou can work with this simulator if your call " "The simulator is running!\n\nYou can work with this simulator if your call "
"RevPiModIO with this additional parameters:\nprocimg={procimg}\nconfigrsc={config}\n\n" "RevPiModIO with this additional parameters:\nprocimg={0}\nconfigrsc={1}\n\n"
"You can copy that from header textbox." "You can copy that from header textbox."
).format(procimg=procimg_file, config=configrsc_file) ).format(procimg_file, configrsc_file)
)
self.txt_connection.setText(
"configrsc=\"{0}\", procimg=\"{1}\"".format(configrsc_file, procimg_file)
) )
self.txt_connection.setText("configrsc=\"{0}\", procimg=\"{1}\"".format(configrsc_file, procimg_file))
# Stop button will disable simulating # Stop button will disable simulating
self.btn_plc_stop.setEnabled(True) self.btn_plc_stop.setEnabled(True)
@@ -235,8 +233,8 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
QtWidgets.QMessageBox.critical( QtWidgets.QMessageBox.critical(
self, self.tr("Can not start..."), self.tr( self, self.tr("Can not start..."), self.tr(
"Can not start the simulator! Maybe the piCtory file is corrupt " "Can not start the simulator! Maybe the piCtory file is corrupt "
"or you can not write to the location '{0}'.".format(dir_name) "or you can not write to the location '{0}'."
) ).format(dir_name)
) )
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
@@ -249,8 +247,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
QtWidgets.QMessageBox.warning( QtWidgets.QMessageBox.warning(
self, self.tr("Warning"), self.tr( self, self.tr("Warning"), self.tr(
"This version of Logviewer ist not supported in version {0} " "This version of Logviewer ist not supported in version {0} "
"of RevPiPyLoad on your RevPi! You need at least version " "of RevPiPyLoad on your RevPi! You need at least version 0.4.1."
"0.4.1."
).format(helper.cm.call_remote_function("version", default_value="-")) ).format(helper.cm.call_remote_function("version", default_value="-"))
) )
return None return None

6
revpicommander/revpiprogram.py
View File

@@ -635,8 +635,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
QtWidgets.QMessageBox.information( QtWidgets.QMessageBox.information(
self, self.tr("Success"), self.tr( self, self.tr("Success"), self.tr(
"piCtory configuration successfully loaded and saved to:\n{0}." "piCtory configuration successfully loaded and saved to:\n{0}."
"".format(filename) ).format(filename)
)
) )
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
@@ -699,8 +698,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
QtWidgets.QMessageBox.information( QtWidgets.QMessageBox.information(
self, self.tr("Success"), self.tr( self, self.tr("Success"), self.tr(
"Process image successfully loaded and saved to:\n{0}." "Process image successfully loaded and saved to:\n{0}."
"".format(filename) ).format(filename)
)
) )
# endregion # # # # # # endregion # # # # #