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

Manage revolution pi saved settings in an own class

Browse Source 
Start a complete new setting file with right naming. Import all old
saved connections from old settings file. Revolution Pi saved settings
are now in an own class with all properties and default values. All
modules are using this new setting class, which support the save
function.
This commit is contained in:
Sven Sager
2023-01-09 17:22:47 +01:00
parent bfe30513a7
commit 98b4879b7f
15 changed files with 632 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.iss
View File

@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "RevPi Commander" #define MyAppName "RevPi Commander"
#define MyAppVersion "0.9.10rc1" #define MyAppVersion "0.9.10rc2"
#define MyAppPublisher "Sven Sager" #define MyAppPublisher "Sven Sager"
#define MyAppURL "https://revpimodio.org/" #define MyAppURL "https://revpimodio.org/"
#define MyAppICO "data\revpicommander.ico" #define MyAppICO "data\revpicommander.ico"

2
setup.py
View File

@@ -8,7 +8,7 @@ from setuptools import find_namespace_packages, setup
setup( setup(
name="revpicommander", name="revpicommander",
version="0.9.10rc1", version="0.9.10rc2",
packages=find_namespace_packages("src"), packages=find_namespace_packages("src"),
package_dir={'': 'src'}, package_dir={'': 'src'},

342
src/revpicommander/avahisearch.py
View File

@@ -5,40 +5,18 @@ __copyright__ = "Copyright (C) 2023 Sven Sager"
__license__ = "GPLv3" __license__ = "GPLv3"
import webbrowser import webbrowser
from os import name as osname
from re import compile from re import compile
from sys import platform from sys import platform
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from zeroconf import IPVersion, ServiceBrowser, Zeroconf from zeroconf import IPVersion, ServiceBrowser, Zeroconf
from . import helper
from . import proginit as pi from . import proginit as pi
from .helper import WidgetData, settings from .helper import RevPiSettings, WidgetData, all_revpi_settings
from .ui.avahisearch_ui import Ui_diag_search from .ui.avahisearch_ui import Ui_diag_search
def find_settings_index(address: str, port: int) -> int:
"""
Search index of saved settings.
:param address: Host or IP address of Revolution Pi
:param port: Port to connect
:return: Index of settings array or -1, if not found
"""
settings_index = -1
for i in range(settings.beginReadArray("connections")):
settings.setArrayIndex(i)
_address = settings.value("address", type=str)
_port = settings.value("port", type=int)
if address.lower() == _address.lower() and port == _port:
settings_index = i
break
settings.endArray()
return settings_index
class AvahiSearchThread(QtCore.QThread): class AvahiSearchThread(QtCore.QThread):
"""Search thread for Revolution Pi with installed RevPiPyLoad.""" """Search thread for Revolution Pi with installed RevPiPyLoad."""
added = QtCore.pyqtSignal(str, str, int, str, str) added = QtCore.pyqtSignal(str, str, int, str, str)
@@ -49,30 +27,11 @@ class AvahiSearchThread(QtCore.QThread):
super(AvahiSearchThread, self).__init__(parent) super(AvahiSearchThread, self).__init__(parent)
self._cycle_wait_ms = 1000 self._cycle_wait_ms = 1000
self.__dict_arp = {}
self.re_posix = compile( self.re_posix = compile(
r"(?P<ip>(\d{1,3}\.){3}\d{1,3}).*" r"(?P<ip>(\d{1,3}\.){3}\d{1,3}).*"
r"(?P<mac>([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2})" r"(?P<mac>([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2})"
) )
def _update_arp(self) -> None:
"""Find mac address in arp table."""
if osname == "posix":
with open("/proc/net/arp") as fh:
for line in fh.readlines():
ip_mac = self.re_posix.search(line)
if ip_mac:
self.__dict_arp[ip_mac.group("ip")] = ip_mac.group("mac")
def get_mac(self, ip: str) -> dict:
"""
Get mac address of ip, if known.
:param ip: IP address to find mac address
:return: MAC address as string or empty string, if unknown
"""
return self.__dict_arp.get(ip, "")
def remove_service(self, zeroconf: Zeroconf, conf_type: str, name: str) -> None: def remove_service(self, zeroconf: Zeroconf, conf_type: str, name: str) -> None:
"""Revolution Pi disappeared.""" """Revolution Pi disappeared."""
pi.logger.debug("AvahiSearchThread.remove_service") pi.logger.debug("AvahiSearchThread.remove_service")
@@ -115,17 +74,20 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
super(AvahiSearch, self).__init__(parent) super(AvahiSearch, self).__init__(parent)
self.setupUi(self) self.setupUi(self)
# Global variables to let parent decide other actions
self.connect_settings = None
self.just_save = False
# Local variables
self.clipboard = QtGui.QGuiApplication.clipboard() self.clipboard = QtGui.QGuiApplication.clipboard()
self.connect_index = -1 self._th_zero_conf = AvahiSearchThread(self)
self.known_hosts = {}
self.th_zero_conf = AvahiSearchThread(self)
self.tb_revpi.setColumnWidth(0, 250) self.tb_revpi.setColumnWidth(0, 250)
self.btn_connect.setEnabled(False) self.btn_connect.setEnabled(False)
self.btn_save.setEnabled(False) self.btn_save.setEnabled(False)
self.restoreGeometry(settings.value("avahisearch/geo", b'')) self.restoreGeometry(helper.settings.value("avahisearch/geo", b''))
column_sizes = settings.value("avahisearch/column_sizes", [], type=list) column_sizes = helper.settings.value("avahisearch/column_sizes", [], type=list)
if len(column_sizes) == self.tb_revpi.columnCount(): if len(column_sizes) == self.tb_revpi.columnCount():
for i in range(self.tb_revpi.columnCount()): for i in range(self.tb_revpi.columnCount()):
self.tb_revpi.setColumnWidth(i, int(column_sizes[i])) self.tb_revpi.setColumnWidth(i, int(column_sizes[i]))
@@ -136,160 +98,133 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
self.cm_connect_actions.addAction(self.act_connect_xmlrpc) self.cm_connect_actions.addAction(self.act_connect_xmlrpc)
self.cm_quick_actions = QtWidgets.QMenu(self) self.cm_quick_actions = QtWidgets.QMenu(self)
self.cm_quick_actions.addAction(self.act_open_pictory) self.cm_quick_actions.addAction(self.act_connect)
self.cm_quick_actions.addSeparator()
self.cm_quick_actions.addAction(self.act_copy_ip)
self.cm_quick_actions.addAction(self.act_copy_host)
self.cm_quick_actions.addSeparator()
self.cm_quick_actions.addAction(self.act_connect_ssh) self.cm_quick_actions.addAction(self.act_connect_ssh)
self.cm_quick_actions.addAction(self.act_connect_xmlrpc) self.cm_quick_actions.addAction(self.act_connect_xmlrpc)
self.cm_quick_actions.addSeparator()
self.cm_quick_actions.addAction(self.act_open_pictory)
self.cm_quick_actions.addSeparator()
self.cm_quick_actions.addAction(self.act_copy_host)
self.cm_quick_actions.addAction(self.act_copy_ip)
self.tb_revpi.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) self.tb_revpi.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
self.tb_revpi.customContextMenuRequested.connect(self._cm_quick_exec) self.tb_revpi.customContextMenuRequested.connect(self._cm_quick_exec)
@QtCore.pyqtSlot(QtCore.QPoint)
def _cm_connect_exec(self, position: QtCore.QPoint) -> None:
row = self.tb_revpi.currentRow()
if row == -1:
return
item = self.tb_revpi.item(row, 0)
settings_index = find_settings_index(item.data(WidgetData.address), item.data(WidgetData.port))
if settings_index >= 0:
self.connect_index = settings_index
self.accept()
return
action = self.cm_connect_actions.exec(position)
if action:
action.trigger()
@QtCore.pyqtSlot(QtCore.QPoint) @QtCore.pyqtSlot(QtCore.QPoint)
def _cm_quick_exec(self, position: QtCore.QPoint) -> None: def _cm_quick_exec(self, position: QtCore.QPoint) -> None:
if self.tb_revpi.currentItem() is None: selected_items = self.tb_revpi.selectedItems()
if not selected_items:
return return
item = selected_items[0]
revpi_settings = bool(item.data(WidgetData.revpi_settings))
self.act_connect.setVisible(revpi_settings)
self.act_connect_ssh.setVisible(not revpi_settings)
self.act_connect_xmlrpc.setVisible(not revpi_settings)
sender = self.sender() sender = self.sender()
action = self.cm_quick_actions.exec(sender.mapToGlobal(position)) self.cm_quick_actions.exec(sender.mapToGlobal(position))
if action:
action.trigger()
def _load_known_hosts(self) -> None: self.act_connect.setVisible(True)
"""Load existing connections to show hostname of existing ip addresses""" self.act_connect_ssh.setVisible(True)
self.known_hosts.clear() self.act_connect_xmlrpc.setVisible(True)
for i in range(settings.beginReadArray("connections")): @staticmethod
settings.setArrayIndex(i) def _find_settings(address: str) -> list[RevPiSettings]:
"""Find all settings with known avahi_id."""
name = settings.value("name", type=str) return [
folder = settings.value("folder", type=str) revpi_setting
address = settings.value("address", type=str) for revpi_setting in all_revpi_settings()
self.known_hosts[address] = "{0}/{1}".format(folder, name) if folder else name if revpi_setting.address.lower() == address.lower()
]
settings.endArray()
def _restart_search(self) -> None: def _restart_search(self) -> None:
"""Clean up and restart search thread.""" """Clean up and restart search thread."""
while self.tb_revpi.rowCount() > 0: while self.tb_revpi.rowCount() > 0:
# Remove each row, a .clean would destroy the columns
self.tb_revpi.removeRow(0) self.tb_revpi.removeRow(0)
self.th_zero_conf.requestInterruption()
self.th_zero_conf = AvahiSearchThread(self) self._th_zero_conf.requestInterruption()
self.th_zero_conf.added.connect(self.on_avahi_added)
self.th_zero_conf.updated.connect(self.on_avahi_added)
self.th_zero_conf.removed.connect(self.on_avahi_removed)
self.th_zero_conf.start()
def _save_connection(self, row: int, ssh_tunnel: bool, no_warn=False) -> int: self._th_zero_conf = AvahiSearchThread(self)
self._th_zero_conf.added.connect(self.on_avahi_added)
self._th_zero_conf.updated.connect(self.on_avahi_added)
self._th_zero_conf.removed.connect(self.on_avahi_removed)
self._th_zero_conf.start()
def _create_settings_object(self, row: int, ssh_tunnel: bool) -> RevPiSettings or None:
""" """
Save the connection from given row to settings. Create settings object from given row to settings.
:param row: Row with connection data :param row: Row with connection data
:param ssh_tunnel: Save as SSH tunnel connection :param ssh_tunnel: Save as SSH tunnel connection
:param no_warn: If True, no message boxes will appear :return: RevPi settings with data from avahi search and default values
:return: Array index of connection (found or saved) or -1
""" """
item = self.tb_revpi.item(row, 0) item = self.tb_revpi.item(row, 0)
if not item: if not item:
return -1 return None
folder_name = self.tr("Auto discovered") settings = RevPiSettings()
selected_name = item.text() settings.folder = self.tr("Auto discovered")
selected_address = item.data(WidgetData.address) settings.name = item.data(WidgetData.host_name)
selected_port = item.data(WidgetData.port) settings.address = item.data(WidgetData.address)
i = 0 settings.port = item.data(WidgetData.port)
for i in range(settings.beginReadArray("connections")): settings.ssh_use_tunnel = ssh_tunnel
settings.setArrayIndex(i)
name = settings.value("name", type=str) return settings
address = settings.value("address", type=str)
port = settings.value("port", type=int)
if address.lower() == selected_address.lower() and port == selected_port:
if not no_warn:
QtWidgets.QMessageBox.information(
self, self.tr("Already in list..."), self.tr(
"The selected Revolution Pi is already saved in your "
"connection list as '{0}'."
).format(name)
)
settings.endArray()
return i
settings.endArray()
settings.beginWriteArray("connections")
settings.setArrayIndex(i + 1)
settings.setValue("address", selected_address)
settings.setValue("folder", folder_name)
settings.setValue("name", selected_name)
settings.setValue("port", selected_port)
settings.setValue("ssh_use_tunnel", ssh_tunnel)
settings.setValue("ssh_port", 22)
settings.setValue("ssh_user", "pi")
settings.endArray()
if not no_warn:
QtWidgets.QMessageBox.information(
self, self.tr("Success"), self.tr(
"The connection with the name '{0}' was successfully saved "
"to folder '{1}' in your connections."
).format(selected_name, folder_name)
)
return i + 1
def closeEvent(self, a0: QtGui.QCloseEvent) -> None: def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
settings.setValue("avahisearch/geo", self.saveGeometry()) helper.settings.setValue("avahisearch/geo", self.saveGeometry())
settings.setValue("avahisearch/column_sizes", [ helper.settings.setValue("avahisearch/column_sizes", [
self.tb_revpi.columnWidth(i) self.tb_revpi.columnWidth(i)
for i in range(self.tb_revpi.columnCount()) for i in range(self.tb_revpi.columnCount())
]) ])
def exec(self) -> int: def exec(self) -> int:
self._load_known_hosts() self.connect_settings = None
self.just_save = False
self._restart_search() self._restart_search()
rc = super(AvahiSearch, self).exec() rc = super(AvahiSearch, self).exec()
self.th_zero_conf.requestInterruption() self._th_zero_conf.requestInterruption()
return rc return rc
@QtCore.pyqtSlot()
def on_act_connect_triggered(self) -> None:
"""Connect via existing settings or ask for type."""
pi.logger.debug("AvahiSearch.on_act_connect_triggered")
selected_items = self.tb_revpi.selectedItems()
if not selected_items:
return
item = selected_items[0]
revpi_settings = item.data(WidgetData.revpi_settings) # type: RevPiSettings
if not revpi_settings:
return
self.connect_settings = revpi_settings
self.accept()
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_act_connect_ssh_triggered(self) -> None: def on_act_connect_ssh_triggered(self) -> None:
"""Copy ip address of selected item to clipboard.""" """Create new revpi settings with ssh, save and connect."""
pi.logger.debug("AvahiSearch.on_act_connect_ssh_triggered") pi.logger.debug("AvahiSearch.on_act_connect_ssh_triggered")
if self.tb_revpi.currentRow() == -1: if self.tb_revpi.currentRow() == -1:
return return
self.connect_index = self._save_connection(self.tb_revpi.currentRow(), True, no_warn=True)
revpi_settings = self._create_settings_object(self.tb_revpi.currentRow(), True)
revpi_settings.save_settings()
self.connect_settings = revpi_settings
self.accept() self.accept()
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_act_connect_xmlrpc_triggered(self) -> None: def on_act_connect_xmlrpc_triggered(self) -> None:
"""Copy ip address of selected item to clipboard.""" """Create new revpi settings with XML-RPC, save and connect."""
pi.logger.debug("AvahiSearch.on_act_connect_xmlrpc_triggered") pi.logger.debug("AvahiSearch.on_act_connect_xmlrpc_triggered")
if self.tb_revpi.currentRow() == -1: if self.tb_revpi.currentRow() == -1:
return return
self.connect_index = self._save_connection(self.tb_revpi.currentRow(), False, no_warn=True)
revpi_settings = self._create_settings_object(self.tb_revpi.currentRow(), False)
revpi_settings.save_settings()
self.connect_settings = revpi_settings
self.accept() self.accept()
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
@@ -327,45 +262,64 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
webbrowser.open("http://{0}/".format(item.data(WidgetData.host_name))) webbrowser.open("http://{0}/".format(item.data(WidgetData.host_name)))
@QtCore.pyqtSlot(str, str, int, str, str) @QtCore.pyqtSlot(str, str, int, str, str)
def on_avahi_added(self, name: str, server: str, port: int, conf_type: str, ip: str) -> None: def on_avahi_added(self, avahi_id: str, server: str, port: int, conf_type: str, ip: str) -> None:
"""New Revolution Pi found.""" """New Revolution Pi found."""
index = -1
for i in range(self.tb_revpi.rowCount()):
if self.tb_revpi.item(i, 0).data(WidgetData.object_name) == name:
index = i
break
if index == -1: def update_tb_revpi_row(row_index: int):
# New Row host_name = server[:-1]
item_name = self.tb_revpi.item(row_index, 0)
item_name.setData(WidgetData.address, ip)
item_name.setData(WidgetData.port, port)
item_name.setData(WidgetData.host_name, host_name)
revpi_settings = item_name.data(WidgetData.revpi_settings) # type: RevPiSettings
if revpi_settings:
# Generate the name of saved revpi and show the avahi-name in brackets
settings_text = "{0}/{1}".format(revpi_settings.folder, revpi_settings.name) \
if revpi_settings.folder \
else revpi_settings.name
if revpi_settings.ssh_use_tunnel:
settings_text += self.tr(" over SSH")
item_name.setText("{0} ({1})".format(settings_text, host_name))
else:
item_name.setText(host_name)
item_name.setToolTip(item_name.text())
item_ip = self.tb_revpi.item(row_index, 1)
item_ip.setText(ip)
item_ip.setToolTip(item_name.text())
lst_existing = self._find_settings(ip)
exists = False
for i in range(self.tb_revpi.rowCount()):
item_tb_revpi = self.tb_revpi.item(i, 0)
if item_tb_revpi.data(WidgetData.object_name) == avahi_id:
# Object already discovered
update_tb_revpi_row(i)
exists = True
if not exists:
for known_settings in lst_existing or [None]:
item_name = QtWidgets.QTableWidgetItem() item_name = QtWidgets.QTableWidgetItem()
item_ip = QtWidgets.QTableWidgetItem()
item_name.setIcon(QtGui.QIcon(":/main/ico/cpu.ico"))
item_name.setData(WidgetData.object_name, avahi_id)
item_name.setData(WidgetData.revpi_settings, known_settings)
index = self.tb_revpi.rowCount() index = self.tb_revpi.rowCount()
self.tb_revpi.insertRow(index) self.tb_revpi.insertRow(index)
self.tb_revpi.setItem(index, 0, item_name) self.tb_revpi.setItem(index, 0, item_name)
self.tb_revpi.setItem(index, 1, item_ip) self.tb_revpi.setItem(index, 1, QtWidgets.QTableWidgetItem())
else:
# Update row
item_name = self.tb_revpi.item(index, 0)
item_ip = self.tb_revpi.item(index, 1)
host_name = server[:-1] update_tb_revpi_row(index)
item_name.setIcon(QtGui.QIcon(":/main/ico/cpu.ico"))
if ip in self.known_hosts:
item_name.setText("{0} ({1})".format(host_name, self.known_hosts[ip]))
else:
item_name.setText(host_name)
item_name.setData(WidgetData.object_name, name)
item_name.setData(WidgetData.address, ip)
item_name.setData(WidgetData.port, port)
item_name.setData(WidgetData.host_name, host_name)
item_ip.setText(ip)
@QtCore.pyqtSlot(str, str) @QtCore.pyqtSlot(str, str)
def on_avahi_removed(self, name: str, conf_type: str) -> None: def on_avahi_removed(self, avahi_id: str, conf_type: str) -> None:
"""Revolution Pi disappeared.""" """Revolution Pi disappeared."""
for i in range(self.tb_revpi.rowCount()): for i in range(self.tb_revpi.rowCount()):
if self.tb_revpi.item(i, 0).data(WidgetData.object_name) == name: if self.tb_revpi.item(i, 0).data(WidgetData.object_name) == avahi_id:
self.tb_revpi.removeRow(i) self.tb_revpi.removeRow(i)
break break
@@ -373,8 +327,17 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
def on_tb_revpi_cellDoubleClicked(self, row: int, column: int) -> None: def on_tb_revpi_cellDoubleClicked(self, row: int, column: int) -> None:
"""Connect to double-clicked Revolution Pi.""" """Connect to double-clicked Revolution Pi."""
pi.logger.debug("AvahiSearch.on_tb_revpi_cellDoubleClicked") pi.logger.debug("AvahiSearch.on_tb_revpi_cellDoubleClicked")
selected_items = self.tb_revpi.selectedItems()
if not selected_items:
return
item = selected_items[0]
revpi_settings = bool(item.data(WidgetData.revpi_settings))
if revpi_settings:
self.act_connect.trigger()
else:
cur = QtGui.QCursor() cur = QtGui.QCursor()
self._cm_connect_exec(cur.pos()) self.cm_connect_actions.exec(cur.pos())
@QtCore.pyqtSlot(int, int, int, int) @QtCore.pyqtSlot(int, int, int, int)
def on_tb_revpi_currentCellChanged(self, row: int, column: int, last_row: int, last_column: int) -> None: def on_tb_revpi_currentCellChanged(self, row: int, column: int, last_row: int, last_column: int) -> None:
@@ -386,18 +349,29 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
def on_btn_connect_clicked(self) -> None: def on_btn_connect_clicked(self) -> None:
"""Connect to selected Revolution Pi.""" """Connect to selected Revolution Pi."""
pi.logger.debug("AvahiSearch.on_btn_connect_clicked") pi.logger.debug("AvahiSearch.on_btn_connect_clicked")
# Open context menu under the button selected_items = self.tb_revpi.selectedItems()
pos = self.btn_connect.pos() if not selected_items:
pos.setY(pos.y() + self.btn_connect.height()) return
self._cm_connect_exec(self.mapToGlobal(pos)) item = selected_items[0]
revpi_settings = bool(item.data(WidgetData.revpi_settings))
if revpi_settings:
self.act_connect.trigger()
else:
pos_context_menu = self.btn_connect.pos()
pos_context_menu.setY(pos_context_menu.y() + self.btn_connect.height())
self.cm_connect_actions.exec(self.mapToGlobal(pos_context_menu))
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_btn_save_clicked(self) -> None: def on_btn_save_clicked(self) -> None:
"""Save selected Revolution Pi.""" """Save selected Revolution Pi."""
pi.logger.debug("AvahiSearch.on_btn_save_clicked") pi.logger.debug("AvahiSearch.on_btn_save_clicked")
if self.tb_revpi.currentRow() == -1: row_index = self.tb_revpi.currentRow()
if row_index == -1:
return return
self.connect_index = self._save_connection(self.tb_revpi.currentRow(), ssh_tunnel=True) self.connect_settings = self._create_settings_object(row_index, True)
self.just_save = True
self.accept()
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_btn_restart_clicked(self) -> None: def on_btn_restart_clicked(self) -> None:

8
src/revpicommander/debugcontrol.py
View File

@@ -74,7 +74,7 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
QtWidgets.QSpacerItem(20, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) QtWidgets.QSpacerItem(20, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
) )
self.cbx_write.setEnabled(False) self.cbx_write.setEnabled(False)
self.cbx_stay_on_top.setChecked(helper.settings.value("stay_on_top", False, bool)) self.cbx_stay_on_top.setChecked(helper.settings.value("debugcontrol/stay_on_top", False, bool))
def __del__(self): def __del__(self):
pi.logger.debug("DebugControl.__del__") pi.logger.debug("DebugControl.__del__")
@@ -342,7 +342,7 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
self._work_values(refresh=True) self._work_values(refresh=True)
self._set_gui_control_states() self._set_gui_control_states()
self.cbx_refresh.setChecked(helper.settings.value("auto_refresh", False, bool)) self.cbx_refresh.setChecked(helper.settings.value("debugcontrol/auto_refresh", False, bool))
return True return True
@@ -415,12 +415,12 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
@QtCore.pyqtSlot(bool) @QtCore.pyqtSlot(bool)
def on_cbx_refresh_clicked(self, state: bool): def on_cbx_refresh_clicked(self, state: bool):
"""Save the state on user action.""" """Save the state on user action."""
helper.settings.setValue("auto_refresh", state) helper.settings.setValue("debugcontrol/auto_refresh", state)
@QtCore.pyqtSlot(bool) @QtCore.pyqtSlot(bool)
def on_cbx_stay_on_top_clicked(self, state: bool): def on_cbx_stay_on_top_clicked(self, state: bool):
"""Save the state on user action.""" """Save the state on user action."""
helper.settings.setValue("stay_on_top", state) helper.settings.setValue("debugcontrol/stay_on_top", state)
@QtCore.pyqtSlot(int) @QtCore.pyqtSlot(int)
def on_cbx_write_stateChanged(self, state: int): def on_cbx_write_stateChanged(self, state: int):

4
src/revpicommander/debugios.py
View File

@@ -26,7 +26,7 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
super(DebugIos, self).__init__(parent) super(DebugIos, self).__init__(parent)
self.setupUi(self) self.setupUi(self)
self.restoreGeometry(helper.cm.debug_geos.get(position, b'')) self.restoreGeometry(helper.cm.settings.debug_geos.get(position, b''))
self.setWindowTitle("{0} - {1}".format(position, name)) self.setWindowTitle("{0} - {1}".format(position, name))
self.gb_io.setTitle(self.gb_io.title().format(name)) self.gb_io.setTitle(self.gb_io.title().format(name))
@@ -58,7 +58,7 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
def closeEvent(self, a0: QtGui.QCloseEvent): def closeEvent(self, a0: QtGui.QCloseEvent):
pi.logger.debug("DebugIos.closeEvent") pi.logger.debug("DebugIos.closeEvent")
helper.cm.debug_geos[self.position] = self.saveGeometry() helper.cm.settings.debug_geos[self.position] = self.saveGeometry()
self.device_closed.emit(self.position) self.device_closed.emit(self.position)
@staticmethod @staticmethod

332
src/revpicommander/helper.py
View File

@@ -12,6 +12,7 @@ from os import environ, remove
from os.path import exists from os.path import exists
from queue import Queue from queue import Queue
from threading import Lock from threading import Lock
from uuid import uuid4
from xmlrpc.client import Binary, ServerProxy from xmlrpc.client import Binary, ServerProxy
from PyQt5 import QtCore, QtWidgets from PyQt5 import QtCore, QtWidgets
@@ -21,31 +22,166 @@ from . import proginit as pi
from .ssh_tunneling.server import SSHLocalTunnel from .ssh_tunneling.server import SSHLocalTunnel
from .sshauth import SSHAuth, SSHAuthType from .sshauth import SSHAuth, SSHAuthType
settings = QtCore.QSettings("revpimodio.org", "RevPiCommander")
"""Global application settings."""
homedir = environ.get("HOME", "") or environ.get("APPDATA", "")
"""Home dir of user."""
class WidgetData(IntEnum): class WidgetData(IntEnum):
address = 260 address = 260
replace_ios_config = 261
acl_level = 262 acl_level = 262
has_error = 263 has_error = 263
port = 264 port = 264
object_name = 265 object_name = 265
timeout = 266
host_name = 267 host_name = 267
last_dir_upload = 301
last_file_upload = 302
last_dir_pictory = 303
last_dir_picontrol = 304
last_dir_selected = 305
last_pictory_file = 306
last_tar_file = 307
last_zip_file = 308
file_name = 309 file_name = 309
watch_files = 310 revpi_settings = 320
watch_path = 311
debug_geos = 312
ssh_use_tunnel = 313 class RevPiSettings:
ssh_port = 315
ssh_user = 316 def __init__(self, load_index: int = None, settings_storage: QtCore.QSettings = None):
"""
Revolution Pi saved settings.
:param load_index: Load settings from index, same as .load_from_index
:param settings_storage: Change QSettings object to work on from default to this one
"""
self._settings = settings_storage or settings
self.internal_id = ""
self.name = "New connection"
self.folder = ""
self.address = "127.0.0.1"
self.port = 55123
self.timeout = 5
self.ssh_use_tunnel = False
self.ssh_port = 22
self.ssh_user = "pi"
self.last_dir_upload = "."
self.last_file_upload = "."
self.last_dir_pictory = "."
self.last_dir_picontrol = "."
self.last_dir_selected = "."
self.last_pictory_file = ""
self.last_tar_file = ""
self.last_zip_file = ""
self.watch_files = []
self.watch_path = ""
self.debug_geos = {}
if load_index is not None:
self.load_from_index(load_index)
def load_from_index(self, settings_index: int) -> None:
"""Load settings from 'connections' index."""
self._settings.beginReadArray("connections")
self._settings.setArrayIndex(settings_index)
# Flag as "legacy" connection to generate missing internal_id on save_settings()
self.internal_id = self._settings.value("internal_id", "legacy", type=str)
self.name = self._settings.value("name", type=str)
self.folder = self._settings.value("folder", "", type=str)
self.address = self._settings.value("address", type=str)
self.port = self._settings.value("port", 55123, type=int)
self.timeout = self._settings.value("timeout", 5, type=int)
self.ssh_use_tunnel = self._settings.value("ssh_use_tunnel", False, type=bool)
self.ssh_port = self._settings.value("ssh_port", 22, type=int)
self.ssh_user = self._settings.value("ssh_user", "pi", type=str)
self.last_dir_upload = self._settings.value("last_dir_upload", ".", type=str)
self.last_file_upload = self._settings.value("last_file_upload", ".", type=str)
self.last_dir_pictory = self._settings.value("last_dir_pictory", ".", type=str)
self.last_dir_picontrol = self._settings.value("last_dir_picontrol", ".", type=str)
self.last_dir_selected = self._settings.value("last_dir_selected", ".", type=str)
self.last_pictory_file = self._settings.value("last_pictory_file", "", type=str)
self.last_tar_file = self._settings.value("last_tar_file", "", type=str)
self.last_zip_file = self._settings.value("last_zip_file", "", type=str)
self.watch_files = self._settings.value("watch_files", [], type=list)
self.watch_path = self._settings.value("watch_path", "", type=str)
try:
# Bytes with QSettings are a little difficult sometimes
self.debug_geos = self._settings.value("debug_geos", {}, type=dict)
except Exception:
# Just drop the geos of IO windows
pass
# These values must exists
if not (self.name and self.address and self.port):
raise ValueError("Could not geht all required values from saved settings")
self._settings.endArray()
def save_settings(self):
"""Save all settings."""
count_settings = self._settings.beginReadArray("connections")
def create_new_array_member():
"""Insert a new setting at the end of the array."""
# Close the active array action to reopen a write action to expand the array
self._settings.endArray()
self._settings.beginWriteArray("connections")
self._settings.setArrayIndex(count_settings)
self.internal_id = uuid4().hex
if not self.internal_id:
create_new_array_member()
else:
# Always search setting in array, because connection manager could reorganize array indexes
index = -1
for index in range(count_settings):
self._settings.setArrayIndex(index)
if self.internal_id == "legacy":
# Legacy connection without internal_id
if self._settings.value("address") == self.address:
# Set missing internal_id
self.internal_id = uuid4().hex
break
else:
if self._settings.value("internal_id") == self.internal_id:
break
if index == count_settings - 1:
# On this point, we iterate all settings and found none, so create new one
create_new_array_member()
self._settings.setValue("internal_id", self.internal_id)
self._settings.setValue("name", self.name)
self._settings.setValue("folder", self.folder)
self._settings.setValue("address", self.address)
self._settings.setValue("port", self.port)
self._settings.setValue("timeout", self.timeout)
self._settings.setValue("ssh_use_tunnel", self.ssh_use_tunnel)
self._settings.setValue("ssh_port", self.ssh_port)
self._settings.setValue("ssh_user", self.ssh_user)
self._settings.setValue("last_dir_upload", self.last_dir_upload)
self._settings.setValue("last_file_upload", self.last_file_upload)
self._settings.setValue("last_dir_pictory", self.last_dir_pictory)
self._settings.setValue("last_dir_picontrol", self.last_dir_picontrol)
self._settings.setValue("last_dir_selected", self.last_dir_selected)
self._settings.setValue("last_pictory_file", self.last_pictory_file)
self._settings.setValue("last_tar_file", self.last_tar_file)
self._settings.setValue("last_zip_file", self.last_zip_file)
self._settings.setValue("watch_files", self.watch_files)
self._settings.setValue("watch_path", self.watch_path)
self._settings.setValue("debug_geos", self.debug_geos)
self._settings.endArray()
class ConnectionManager(QtCore.QThread): class ConnectionManager(QtCore.QThread):
@@ -75,29 +211,11 @@ class ConnectionManager(QtCore.QThread):
self._revpi = None self._revpi = None
self._revpi_output = None self._revpi_output = None
self.address = "" self.settings = RevPiSettings()
self.name = ""
self.port = 55123
self.ssh_tunnel_server = None # type: SSHLocalTunnel self.ssh_tunnel_server = None # type: SSHLocalTunnel
self.ssh_use_tunnel = False
self.ssh_port = 22
self.ssh_user = "pi"
self.ssh_pass = "" self.ssh_pass = ""
# Sync this with revpiplclist to preserve settings
self.program_last_dir_upload = ""
self.program_last_file_upload = ""
self.program_last_dir_pictory = ""
self.program_last_dir_picontrol = ""
self.program_last_dir_selected = ""
self.program_last_pictory_file = ""
self.program_last_tar_file = ""
self.program_last_zip_file = ""
self.develop_watch_files = []
self.develop_watch_path = ""
self.debug_geos = {}
self.pyload_version = (0, 0, 0) self.pyload_version = (0, 0, 0)
"""Version number of RevPiPyLoad 0.0.0 with <class 'int'> values.""" """Version number of RevPiPyLoad 0.0.0 with <class 'int'> values."""
self.xml_funcs = [] self.xml_funcs = []
@@ -178,60 +296,19 @@ class ConnectionManager(QtCore.QThread):
def _clear_settings(self): def _clear_settings(self):
"""Clear connection settings.""" """Clear connection settings."""
self.address = "" self.settings = RevPiSettings()
self.name = ""
self.port = 55123
self.ssh_use_tunnel = False
self.ssh_port = 22
self.ssh_user = "pi"
self.ssh_pass = "" self.ssh_pass = ""
self.pyload_version = (0, 0, 0) self.pyload_version = (0, 0, 0)
self.xml_funcs.clear() self.xml_funcs.clear()
self.xml_mode = -1 self.xml_mode = -1
self.program_last_dir_upload = "" def pyload_connect(self, settings: RevPiSettings, parent=None) -> bool:
self.program_last_file_upload = ""
self.program_last_dir_pictory = ""
self.program_last_dir_picontrol = ""
self.program_last_dir_selected = ""
self.program_last_pictory_file = ""
self.program_last_tar_file = ""
self.program_last_zip_file = ""
self.develop_watch_files = []
self.develop_watch_path = ""
self.debug_geos = {}
def _save_settings(self):
"""Save settings to named Revolution Pi."""
for i in range(settings.beginReadArray("connections")):
settings.setArrayIndex(i)
if settings.value("address") != self.address:
# Search used connection, because connection manager could reorganize array
continue
settings.setValue("last_dir_upload", self.program_last_dir_upload)
settings.setValue("last_file_upload", self.program_last_file_upload)
settings.setValue("last_dir_pictory", self.program_last_dir_pictory)
settings.setValue("last_dir_picontrol", self.program_last_dir_picontrol)
settings.setValue("last_dir_selected", self.program_last_dir_selected)
settings.setValue("last_pictory_file", self.program_last_pictory_file)
settings.setValue("last_tar_file", self.program_last_tar_file)
settings.setValue("last_zip_file", self.program_last_zip_file)
settings.setValue("watch_files", self.develop_watch_files)
settings.setValue("watch_path", self.develop_watch_path)
settings.setValue("debug_geos", self.debug_geos)
break
settings.endArray()
def pyload_connect(self, settings_index: int, parent=None) -> bool:
""" """
Create a new connection from settings object. Create a new connection from settings object.
:param settings_index: Index of settings array 'connections' :param settings: Revolution Pi saved connection settings
:param parent: Qt parent window for dialog positioning :param parent: Qt parent window for dialog positioning
:return: True, if the connection was successfully established :return: True, if the connection was successfully established
""" """
@@ -239,48 +316,27 @@ class ConnectionManager(QtCore.QThread):
# First disconnect to send signal and clean up values # First disconnect to send signal and clean up values
self.pyload_disconnect() self.pyload_disconnect()
settings.beginReadArray("connections")
settings.setArrayIndex(settings_index)
address = settings.value("address", str)
name = settings.value("name", str)
port = settings.value("port", 55123, int)
timeout = settings.value("timeout", 5, int)
ssh_tunnel_server = None ssh_tunnel_server = None
ssh_use_tunnel = settings.value("ssh_use_tunnel", False, bool)
ssh_port = settings.value("ssh_port", 22, int)
ssh_user = settings.value("ssh_user", "pi", str)
ssh_tunnel_port = 0 ssh_tunnel_port = 0
ssh_pass = "" ssh_pass = ""
self.program_last_dir_upload = settings.value("last_dir_upload", ".", str)
self.program_last_file_upload = settings.value("last_file_upload", ".", str)
self.program_last_dir_pictory = settings.value("last_dir_pictory", ".", str)
self.program_last_dir_picontrol = settings.value("last_dir_picontrol", ".", str)
self.program_last_dir_selected = settings.value("last_dir_selected", ".", str)
self.program_last_pictory_file = settings.value("last_pictory_file", "{0}.rsc".format(name), str)
self.program_last_tar_file = settings.value("last_tar_file", "{0}.tgz".format(name), str)
self.program_last_zip_file = settings.value("last_zip_file", "{0}.zip".format(name), str)
self.develop_watch_files = settings.value("watch_files", [], list)
self.develop_watch_path = settings.value("watch_path", "", str)
self.debug_geos = settings.value("debug_geos", {}, dict)
settings.endArray()
socket.setdefaulttimeout(2) socket.setdefaulttimeout(2)
if ssh_use_tunnel: if settings.ssh_use_tunnel:
while True: while True:
diag_ssh_auth = SSHAuth(SSHAuthType.PASS, parent) diag_ssh_auth = SSHAuth(SSHAuthType.PASS, parent)
diag_ssh_auth.username = ssh_user diag_ssh_auth.username = settings.ssh_user
if not diag_ssh_auth.exec() == QtWidgets.QDialog.Accepted: if not diag_ssh_auth.exec() == QtWidgets.QDialog.Accepted:
self._clear_settings() self._clear_settings()
return False return False
ssh_user = diag_ssh_auth.username ssh_user = diag_ssh_auth.username
ssh_pass = diag_ssh_auth.password ssh_pass = diag_ssh_auth.password
ssh_tunnel_server = SSHLocalTunnel(port, address, ssh_port) ssh_tunnel_server = SSHLocalTunnel(
settings.port,
settings.address,
settings.ssh_port
)
try: try:
ssh_tunnel_port = ssh_tunnel_server.connect_by_credentials(ssh_user, ssh_pass) ssh_tunnel_port = ssh_tunnel_server.connect_by_credentials(ssh_user, ssh_pass)
break break
@@ -304,7 +360,7 @@ class ConnectionManager(QtCore.QThread):
sp = ServerProxy("http://127.0.0.1:{0}".format(ssh_tunnel_port)) sp = ServerProxy("http://127.0.0.1:{0}".format(ssh_tunnel_port))
else: else:
sp = ServerProxy("http://{0}:{1}".format(address, port)) sp = ServerProxy("http://{0}:{1}".format(settings.address, settings.port))
# Load values and test connection to Revolution Pi # Load values and test connection to Revolution Pi
try: try:
@@ -315,7 +371,7 @@ class ConnectionManager(QtCore.QThread):
pi.logger.exception(e) pi.logger.exception(e)
self.connection_error_observed.emit(str(e)) self.connection_error_observed.emit(str(e))
if not self.ssh_use_tunnel: if not settings.ssh_use_tunnel:
# todo: Change message, that user can use ssh # todo: Change message, that user can use ssh
QtWidgets.QMessageBox.critical( QtWidgets.QMessageBox.critical(
parent, self.tr("Error"), self.tr( parent, self.tr("Error"), self.tr(
@@ -330,24 +386,19 @@ class ConnectionManager(QtCore.QThread):
return False return False
self.address = address self.settings = settings
self.name = name
self.port = port
self.ssh_use_tunnel = ssh_use_tunnel
self.ssh_port = ssh_port
self.ssh_user = ssh_user
self.ssh_pass = ssh_pass self.ssh_pass = ssh_pass
self.pyload_version = pyload_version self.pyload_version = pyload_version
self.xml_funcs = xml_funcs self.xml_funcs = xml_funcs
self.xml_mode = xml_mode self.xml_mode = xml_mode
with self._lck_cli: with self._lck_cli:
socket.setdefaulttimeout(timeout) socket.setdefaulttimeout(settings.timeout)
self.ssh_tunnel_server = ssh_tunnel_server self.ssh_tunnel_server = ssh_tunnel_server
self._cli = sp self._cli = sp
self._cli_connect.put_nowait(( self._cli_connect.put_nowait((
"127.0.0.1" if ssh_use_tunnel else address, "127.0.0.1" if settings.ssh_use_tunnel else settings.address,
ssh_tunnel_port if ssh_use_tunnel else port ssh_tunnel_port if settings.ssh_use_tunnel else settings.port
)) ))
self.connection_established.emit() self.connection_established.emit()
@@ -371,9 +422,9 @@ class ConnectionManager(QtCore.QThread):
elif self._cli is not None: elif self._cli is not None:
# Tell all widget, that we want to disconnect, to save the settings # Tell all widget, that we want to disconnect
self.connection_disconnecting.emit() self.connection_disconnecting.emit()
self._save_settings() self.settings.save_settings()
with self._lck_cli: with self._lck_cli:
if self._ps_started: if self._ps_started:
@@ -475,10 +526,14 @@ class ConnectionManager(QtCore.QThread):
if self.ssh_tunnel_server and not self.ssh_tunnel_server.connected: if self.ssh_tunnel_server and not self.ssh_tunnel_server.connected:
self.ssh_tunnel_server.disconnect() self.ssh_tunnel_server.disconnect()
ssh_tunnel_server = SSHLocalTunnel(self.port, self.address, self.ssh_port) ssh_tunnel_server = SSHLocalTunnel(
self.settings.port,
self.settings.address,
self.settings.ssh_port
)
try: try:
ssh_tunnel_port = self.ssh_tunnel_server.connect_by_credentials( ssh_tunnel_port = self.ssh_tunnel_server.connect_by_credentials(
self.ssh_user, self.settings.ssh_user,
self.ssh_pass self.ssh_pass
) )
sp = ServerProxy("http://127.0.0.1:{0}".format(ssh_tunnel_port)) sp = ServerProxy("http://127.0.0.1:{0}".format(ssh_tunnel_port))
@@ -563,9 +618,9 @@ class ConnectionManager(QtCore.QThread):
Use connection_recovered signal to figure out new parameters. Use connection_recovered signal to figure out new parameters.
""" """
if not self.ssh_use_tunnel and self.address and self.port: if not self.settings.ssh_use_tunnel and self.settings.address and self.settings.port:
return ServerProxy("http://{0}:{1}".format(self.address, self.port)) return ServerProxy("http://{0}:{1}".format(self.settings.address, self.settings.port))
if self.ssh_use_tunnel and self.ssh_tunnel_server and self.ssh_tunnel_server.connected: if self.settings.ssh_use_tunnel and self.ssh_tunnel_server and self.ssh_tunnel_server.connected:
return ServerProxy("http://127.0.0.1:{0}".format(self.ssh_tunnel_server.local_tunnel_port)) return ServerProxy("http://127.0.0.1:{0}".format(self.ssh_tunnel_server.local_tunnel_port))
return None return None
@@ -592,8 +647,27 @@ class ConnectionManager(QtCore.QThread):
cm = ConnectionManager() cm = ConnectionManager()
"""Clobal connection manager instance.""" """Clobal connection manager instance."""
settings = QtCore.QSettings("revpipyplc", "revpipyload")
"""Global application settings."""
homedir = environ.get("HOME", "") or environ.get("APPDATA", "") def all_revpi_settings() -> [RevPiSettings]:
"""Home dir of user.""" """Get all revpi settings objects."""
# Get length of array and close it, the RevPiSettings-class need it
count_settings = settings.beginReadArray("connections")
settings.endArray()
return [RevPiSettings(i) for i in range(count_settings)]
def import_old_settings():
if not settings.value("revpicommander/imported_settings", False, type=bool):
settings.setValue("revpicommander/imported_settings", True)
old_settings = QtCore.QSettings("revpipyplc", "revpipyload")
count_settings = old_settings.beginReadArray("connections")
old_settings.endArray()
lst_revpi_settings = [RevPiSettings(i, settings_storage=old_settings) for i in range(count_settings)]
for revpi_setting in lst_revpi_settings:
revpi_setting._settings = settings
revpi_setting.save_settings()
import_old_settings()

BIN
src/revpicommander/locale/revpicommander_de.qm
View File

Binary file not shown.

215
src/revpicommander/locale/revpicommander_de.ts
View File

@@ -68,90 +68,95 @@ Nicht gespeicherte Änderunen gehen verloren</translation>
<context> <context>
<name>AvahiSearch</name> <name>AvahiSearch</name>
<message> <message>
<location filename="../avahisearch.py" line="216"/> <location filename="../avahisearch.py" line="168"/>
<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="229"/> <location filename="../avahisearch.py" line="191"/>
<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="254"/> <location filename="../avahisearch.py" line="201"/>
<source>Success</source> <source>Success</source>
<translation>Erfolgreich</translation> <translation>Erfolgreich</translation>
</message> </message>
<message> <message>
<location filename="../avahisearch.py" line="254"/> <location filename="../avahisearch.py" line="201"/>
<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>
<message> <message>
<location filename="../avahisearch.py" line="229"/> <location filename="../avahisearch.py" line="191"/>
<source>The selected Revolution Pi is already saved in your connection list as &apos;{0}&apos;.</source> <source>The selected Revolution Pi is already saved in your connection list as &apos;{0}&apos;.</source>
<translation>Der ausgewählte RevPi ist schon in der Verbindungsliste als &apos;{0}&apos;.</translation> <translation>Der ausgewählte RevPi ist schon in der Verbindungsliste als &apos;{0}&apos;.</translation>
</message> </message>
<message>
<location filename="../avahisearch.py" line="317"/>
<source> over SSH</source>
<translation> über SSH</translation>
</message>
</context> </context>
<context> <context>
<name>ConnectionManager</name> <name>ConnectionManager</name>
<message> <message>
<location filename="../helper.py" line="454"/> <location filename="../helper.py" line="521"/>
<source>SIMULATING</source> <source>SIMULATING</source>
<translation>SIMULATION</translation> <translation>SIMULATION</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="457"/> <location filename="../helper.py" line="524"/>
<source>NOT CONNECTED</source> <source>NOT CONNECTED</source>
<translation>NICHT VERBUNDEN</translation> <translation>NICHT VERBUNDEN</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="474"/> <location filename="../helper.py" line="541"/>
<source>SERVER ERROR</source> <source>SERVER ERROR</source>
<translation>SERVER FEHLER</translation> <translation>SERVER FEHLER</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="495"/> <location filename="../helper.py" line="566"/>
<source>RUNNING</source> <source>RUNNING</source>
<translation>LÄUFT</translation> <translation>LÄUFT</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="497"/> <location filename="../helper.py" line="568"/>
<source>PLC FILE NOT FOUND</source> <source>PLC FILE NOT FOUND</source>
<translation>SPS PROGRAMM NICHT GEFUNDEN</translation> <translation>SPS PROGRAMM NICHT GEFUNDEN</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="499"/> <location filename="../helper.py" line="570"/>
<source>NOT RUNNING (NO STATUS)</source> <source>NOT RUNNING (NO STATUS)</source>
<translation>LÄUFT NICHT (KEIN STATUS)</translation> <translation>LÄUFT NICHT (KEIN STATUS)</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="501"/> <location filename="../helper.py" line="572"/>
<source>PROGRAM KILLED</source> <source>PROGRAM KILLED</source>
<translation>PROGRAMM GETÖTET</translation> <translation>PROGRAMM GETÖTET</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="503"/> <location filename="../helper.py" line="574"/>
<source>PROGRAM TERMED</source> <source>PROGRAM TERMED</source>
<translation>PROGRAMM BEENDET</translation> <translation>PROGRAMM BEENDET</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="505"/> <location filename="../helper.py" line="576"/>
<source>NOT RUNNING</source> <source>NOT RUNNING</source>
<translation>LÄUFT NICHT</translation> <translation>LÄUFT NICHT</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="507"/> <location filename="../helper.py" line="578"/>
<source>FINISHED WITH CODE {0}</source> <source>FINISHED WITH CODE {0}</source>
<translation>BEENDET MIT CODE {0}</translation> <translation>BEENDET MIT CODE {0}</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="321"/> <location filename="../helper.py" line="393"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="289"/> <location filename="../helper.py" line="361"/>
<source>The combination of username and password was rejected from the SSH server. <source>The combination of username and password was rejected from the SSH server.
Try again.</source> Try again.</source>
@@ -160,7 +165,7 @@ Try again.</source>
Bitte erneut versuchen.</translation> Bitte erneut versuchen.</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="298"/> <location filename="../helper.py" line="370"/>
<source>Could not establish a SSH connection to server: <source>Could not establish a SSH connection to server:
{0}</source> {0}</source>
@@ -169,7 +174,7 @@ Bitte erneut versuchen.</translation>
{0}</translation> {0}</translation>
</message> </message>
<message> <message>
<location filename="../helper.py" line="321"/> <location filename="../helper.py" line="393"/>
<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!!!
@@ -278,86 +283,86 @@ Ungesicherte Änderungen gehen verloren.</translation>
<context> <context>
<name>RevPiCommander</name> <name>RevPiCommander</name>
<message> <message>
<location filename="../revpicommander.py" line="228"/> <location filename="../revpicommander.py" line="222"/>
<source>Simulator started...</source> <source>Simulator started...</source>
<translation>Simulator gestartet...</translation> <translation>Simulator gestartet...</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="237"/> <location filename="../revpicommander.py" line="231"/>
<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="430"/> <location filename="../revpicommander.py" line="424"/>
<source>Warning</source> <source>Warning</source>
<translation>Warnung</translation> <translation>Warnung</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="253"/> <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="303"/> <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="457"/> <location filename="../revpicommander.py" line="451"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="283"/> <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="336"/> <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="336"/> <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="349"/> <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="349"/> <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="356"/> <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="404"/> <location filename="../revpicommander.py" line="398"/>
<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="430"/> <location filename="../revpicommander.py" line="424"/>
<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="442"/> <location filename="../revpicommander.py" line="436"/>
<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="457"/> <location filename="../revpicommander.py" line="451"/>
<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.
@@ -377,7 +382,7 @@ 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> <message>
<location filename="../revpicommander.py" line="228"/> <location filename="../revpicommander.py" line="222"/>
<source>The simulator is running! <source>The simulator is running!
You can work with this simulator if your call RevPiModIO with this additional parameters: You can work with this simulator if your call RevPiModIO with this additional parameters:
@@ -394,24 +399,24 @@ configrsc={1}
Dies kann aus der Textbox oben kopiert werden.</translation> Dies kann aus der Textbox oben kopiert werden.</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="237"/> <location filename="../revpicommander.py" line="231"/>
<source>Can not start the simulator! Maybe the piCtory file is corrupt or you have no write permissions for &apos;{0}&apos;.</source> <source>Can not start the simulator! Maybe the piCtory file is corrupt or you have no write permissions for &apos;{0}&apos;.</source>
<translation>Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung für &apos;{0}`.</translation> <translation>Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung für &apos;{0}`.</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="404"/> <location filename="../revpicommander.py" line="398"/>
<source>Do you want to reset your process image to {0} values? <source>Do you want to reset your process image to {0} 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 {0} zurückgesetzt werden? <translation>Soll das virtuelle Prozessabbild auf {0} 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="404"/> <location filename="../revpicommander.py" line="398"/>
<source>zero</source> <source>zero</source>
<translation>null</translation> <translation>null</translation>
</message> </message>
<message> <message>
<location filename="../revpicommander.py" line="404"/> <location filename="../revpicommander.py" line="398"/>
<source>piCtory default</source> <source>piCtory default</source>
<translation>piCtory Standardwerte</translation> <translation>piCtory Standardwerte</translation>
</message> </message>
@@ -419,92 +424,92 @@ Es sollten alle RevPiModIO Programme vorher beendet werden, da diese ihre IO Wer
<context> <context>
<name>RevPiFiles</name> <name>RevPiFiles</name>
<message> <message>
<location filename="../revpifiles.py" line="86"/> <location filename="../revpifiles.py" line="85"/>
<source>Please select...</source> <source>Please select...</source>
<translation>Bitte auswählen...</translation> <translation>Bitte auswählen...</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="458"/> <location filename="../revpifiles.py" line="457"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="120"/> <location filename="../revpifiles.py" line="119"/>
<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> <message>
<location filename="../revpifiles.py" line="143"/> <location filename="../revpifiles.py" line="142"/>
<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>
<translation>Der Revolution Pi hat Teile der Übertragung nicht durchgeführt.</translation> <translation>Der Revolution Pi hat Teile der Übertragung nicht durchgeführt.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="151"/> <location filename="../revpifiles.py" line="150"/>
<source>Errors occurred during transmission</source> <source>Errors occurred during transmission</source>
<translation>Fehler bei Übertragung aufgetreten</translation> <translation>Fehler bei Übertragung aufgetreten</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="157"/> <location filename="../revpifiles.py" line="156"/>
<source>Warning</source> <source>Warning</source>
<translation>Warnung</translation> <translation>Warnung</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="157"/> <location filename="../revpifiles.py" line="156"/>
<source>Could not start the plc program on Revolution Pi.</source> <source>Could not start the plc program on Revolution Pi.</source>
<translation>Kann das SPS Programm auf dem Revolution Pi nicht starten.</translation> <translation>Kann das SPS Programm auf dem Revolution Pi nicht starten.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="178"/> <location filename="../revpifiles.py" line="177"/>
<source>The RevPiPyLoad version on the Revolution Pi is to old.</source> <source>The RevPiPyLoad version on the Revolution Pi is to old.</source>
<translation>Die RevPiPyLoad Version auf dem Revolution Pi ist zu alt.</translation> <translation>Die RevPiPyLoad Version auf dem Revolution Pi ist zu alt.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="253"/> <location filename="../revpifiles.py" line="252"/>
<source>Can not open last directory &apos;{0}&apos;.</source> <source>Can not open last directory &apos;{0}&apos;.</source>
<translation>Kann letztes Verzeichnis &apos;{0}&apos; nicht öffnen.</translation> <translation>Kann letztes Verzeichnis &apos;{0}&apos; nicht öffnen.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="310"/> <location filename="../revpifiles.py" line="309"/>
<source>Stop scanning for files, because we found more than {0} files.</source> <source>Stop scanning for files, because we found more than {0} files.</source>
<translation>Dateisuche wurde angehalten, da mehr als {0} Dateien gefunden wurden.</translation> <translation>Dateisuche wurde angehalten, da mehr als {0} Dateien gefunden wurden.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="354"/> <location filename="../revpifiles.py" line="353"/>
<source>Could not load path of working dir</source> <source>Could not load path of working dir</source>
<translation>Kann Arbeitsverzeichnis nicht laden</translation> <translation>Kann Arbeitsverzeichnis nicht laden</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="415"/> <location filename="../revpifiles.py" line="414"/>
<source>Can not load file list from Revolution Pi.</source> <source>Can not load file list from Revolution Pi.</source>
<translation>Kann Dateiliste vom Revolution Pi nicht laden.</translation> <translation>Kann Dateiliste vom Revolution Pi nicht laden.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="447"/> <location filename="../revpifiles.py" line="446"/>
<source>Select folder...</source> <source>Select folder...</source>
<translation>Ordner auswählen...</translation> <translation>Ordner auswählen...</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="458"/> <location filename="../revpifiles.py" line="457"/>
<source>Can not access the folder &apos;{0}&apos; to read files.</source> <source>Can not access the folder &apos;{0}&apos; to read files.</source>
<translation>Keine Berechtigung für Zugriff auf Ordner &apos;{0}&apos;.</translation> <translation>Keine Berechtigung für Zugriff auf Ordner &apos;{0}&apos;.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="559"/> <location filename="../revpifiles.py" line="558"/>
<source>Error...</source> <source>Error...</source>
<translation>Fehler...</translation> <translation>Fehler...</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="508"/> <location filename="../revpifiles.py" line="507"/>
<source>Error while download file &apos;{0}&apos;.</source> <source>Error while download file &apos;{0}&apos;.</source>
<translation>Fehler beim Herunterladen der Datei &apos;{0}&apos;.</translation> <translation>Fehler beim Herunterladen der Datei &apos;{0}&apos;.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="516"/> <location filename="../revpifiles.py" line="515"/>
<source>Override files...</source> <source>Override files...</source>
<translation>Dateien überschreiben...</translation> <translation>Dateien überschreiben...</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="516"/> <location filename="../revpifiles.py" line="515"/>
<source>One or more files does exist on your computer! Do you want to override the existingfiles? <source>One or more files does exist on your computer! Do you want to override the existingfiles?
Select &apos;Yes&apos; to override, &apos;No&apos; to download only missing files.</source> Select &apos;Yes&apos; to override, &apos;No&apos; to download only missing files.</source>
@@ -513,32 +518,32 @@ Select &apos;Yes&apos; to override, &apos;No&apos; to download only missing file
Wählen Sie &apos;Ja&apos; zum Überschreiben, &apos;Nein&apos; um nur fehlende Dateien zu laden.</translation> Wählen Sie &apos;Ja&apos; zum Überschreiben, &apos;Nein&apos; um nur fehlende Dateien zu laden.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="548"/> <location filename="../revpifiles.py" line="547"/>
<source>Delete files from Revolution Pi...</source> <source>Delete files from Revolution Pi...</source>
<translation>Dateien auf Rev Pi löschen...</translation> <translation>Dateien auf Rev Pi löschen...</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="548"/> <location filename="../revpifiles.py" line="547"/>
<source>Do you want to delete {0} files from revolution pi?</source> <source>Do you want to delete {0} files from revolution pi?</source>
<translation>Sollen {0} Dateien vom Revolution Pi gelöscht werden?</translation> <translation>Sollen {0} Dateien vom Revolution Pi gelöscht werden?</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="559"/> <location filename="../revpifiles.py" line="558"/>
<source>Error while delete file &apos;{0}&apos;.</source> <source>Error while delete file &apos;{0}&apos;.</source>
<translation>Fehler beim Löschen der Datei &apos;{0}&apos;.</translation> <translation>Fehler beim Löschen der Datei &apos;{0}&apos;.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="134"/> <location filename="../revpifiles.py" line="133"/>
<source>Information</source> <source>Information</source>
<translation>Information</translation> <translation>Information</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="134"/> <location filename="../revpifiles.py" line="133"/>
<source>A PLC program has been uploaded. Please check the PLC program settings to see if the correct program is specified as the start program.</source> <source>A PLC program has been uploaded. Please check the PLC program settings to see if the correct program is specified as the start program.</source>
<translation>Ein SPS Programm wurde hochgeladen. Bitte prüfe die SPS Programmeinstellungen ob das richtige Startprogramm gewählt ist.</translation> <translation>Ein SPS Programm wurde hochgeladen. Bitte prüfe die SPS Programmeinstellungen ob das richtige Startprogramm gewählt ist.</translation>
</message> </message>
<message> <message>
<location filename="../revpifiles.py" line="181"/> <location filename="../revpifiles.py" line="180"/>
<source>Choose a local directory first.</source> <source>Choose a local directory first.</source>
<translation>Lokales Verzeichnis wählen.</translation> <translation>Lokales Verzeichnis wählen.</translation>
</message> </message>
@@ -658,17 +663,17 @@ Ungesicherte Änderungen gehen verloren.</translation>
<context> <context>
<name>RevPiPlcList</name> <name>RevPiPlcList</name>
<message> <message>
<location filename="../revpiplclist.py" line="27"/> <location filename="../revpiplclist.py" line="28"/>
<source>New connection</source> <source>New connection</source>
<translation>Neue Verbindung</translation> <translation>Neue Verbindung</translation>
</message> </message>
<message> <message>
<location filename="../revpiplclist.py" line="158"/> <location filename="../revpiplclist.py" line="103"/>
<source>Question</source> <source>Question</source>
<translation>Frage</translation> <translation>Frage</translation>
</message> </message>
<message> <message>
<location filename="../revpiplclist.py" line="158"/> <location filename="../revpiplclist.py" line="103"/>
<source>Do you really want to quit? <source>Do you really want to quit?
Unsaved changes will be lost.</source> Unsaved changes will be lost.</source>
<translation>Soll das Fenster wirklich geschlossen werden? <translation>Soll das Fenster wirklich geschlossen werden?
@@ -678,7 +683,7 @@ Ungesicherte Änderungen gehen verloren.</translation>
<context> <context>
<name>RevPiProgram</name> <name>RevPiProgram</name>
<message> <message>
<location filename="../revpiprogram.py" line="688"/> <location filename="../revpiprogram.py" line="680"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
@@ -735,7 +740,7 @@ Please try again.</source>
Versuche es erneut.</translation> Versuche es erneut.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="698"/> <location filename="../revpiprogram.py" line="690"/>
<source>Success</source> <source>Success</source>
<translation>Erfolgreich</translation> <translation>Erfolgreich</translation>
</message> </message>
@@ -787,160 +792,160 @@ An error occurred on piControl reset!</source>
Es trat jedoch ein Fehler beim Zurücksetzen von piControl auf!</translation> Es trat jedoch ein Fehler beim Zurücksetzen von piControl auf!</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="331"/> <location filename="../revpiprogram.py" line="329"/>
<source>Save ZIP archive...</source> <source>Save ZIP archive...</source>
<translation>ZIP Archiv speichern...</translation> <translation>ZIP Archiv speichern...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="427"/> <location filename="../revpiprogram.py" line="419"/>
<source>ZIP archive (*.zip);;All files (*.*)</source> <source>ZIP archive (*.zip);;All files (*.*)</source>
<translation>ZIP Archive (*.tgz);;Alle Dateien (*.*)</translation> <translation>ZIP Archive (*.zip);;Alle Dateien (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="352"/> <location filename="../revpiprogram.py" line="347"/>
<source>Save TGZ archive...</source> <source>Save TGZ archive...</source>
<translation>TGZ Archiv speichern...</translation> <translation>TGZ Archiv speichern...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="352"/> <location filename="../revpiprogram.py" line="347"/>
<source>TGZ archive (*.tgz);;All files (*.*)</source> <source>TGZ archive (*.tgz);;All files (*.*)</source>
<translation>TAR Archive (*.tgz);;Alle Dateien (*.*)</translation> <translation>TAR Archive (*.tgz);;Alle Dateien (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="382"/> <location filename="../revpiprogram.py" line="374"/>
<source>Could not load PLC program from Revolution Pi.</source> <source>Could not load PLC program from Revolution Pi.</source>
<translation>Kann SPS Programm nicht vom Revolution Pi laden.</translation> <translation>Kann SPS Programm nicht vom Revolution Pi laden.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="395"/> <location filename="../revpiprogram.py" line="387"/>
<source>Coud not save the archive or extract the files! <source>Coud not save the archive or extract the files!
Please retry.</source> Please retry.</source>
<translation>Konnte das Archiv nicht speichern oder extrahieren! <translation>Konnte das Archiv nicht speichern oder extrahieren!
Versuche es erneut.</translation> Versuche es erneut.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="401"/> <location filename="../revpiprogram.py" line="393"/>
<source>Transfer successfully completed.</source> <source>Transfer successfully completed.</source>
<translation>Übertragung erfolgreich abgeschlossen.</translation> <translation>Übertragung erfolgreich abgeschlossen.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="427"/> <location filename="../revpiprogram.py" line="419"/>
<source>Upload content of ZIP archive...</source> <source>Upload content of ZIP archive...</source>
<translation>ZIP Archiv hochladen...</translation> <translation>ZIP Archiv hochladen...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="452"/> <location filename="../revpiprogram.py" line="444"/>
<source>The selected file ist not a ZIP archive.</source> <source>The selected file ist not a ZIP archive.</source>
<translation>Die ausgewählte Datei ist kein ZIP Archiv.</translation> <translation>Die ausgewählte Datei ist kein ZIP Archiv.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="461"/> <location filename="../revpiprogram.py" line="453"/>
<source>Upload content of TAR archive...</source> <source>Upload content of TAR archive...</source>
<translation>TAR Archiv hochladen...</translation> <translation>TAR Archiv hochladen...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="461"/> <location filename="../revpiprogram.py" line="453"/>
<source>TAR archive (*.tgz);;All files (*.*)</source> <source>TAR archive (*.tgz);;All files (*.*)</source>
<translation>TAR Archive (*.tgz);;Alle Dateien (*.*)</translation> <translation>TAR Archive (*.tgz);;Alle Dateien (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="486"/> <location filename="../revpiprogram.py" line="478"/>
<source>The selected file ist not a TAR archive.</source> <source>The selected file ist not a TAR archive.</source>
<translation>Die ausgewählte Datei ist kein TAR Archiv.</translation> <translation>Die ausgewählte Datei ist kein TAR Archiv.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="495"/> <location filename="../revpiprogram.py" line="487"/>
<source>No files to upload...</source> <source>No files to upload...</source>
<translation>Keine Dateien zum Hochladen...</translation> <translation>Keine Dateien zum Hochladen...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="495"/> <location filename="../revpiprogram.py" line="487"/>
<source>Found no files to upload in given location or archive.</source> <source>Found no files to upload in given location or archive.</source>
<translation>Konnte keine Dateien in der Quelle zum Hochladen finden.</translation> <translation>Konnte keine Dateien in der Quelle zum Hochladen finden.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="506"/> <location filename="../revpiprogram.py" line="498"/>
<source>There was an error deleting the files on the Revolution Pi. <source>There was an error deleting the files on the Revolution Pi.
Upload aborted! Please try again.</source> Upload aborted! Please try again.</source>
<translation>Beim Löschen der Dateien auf dem Revolution Pi ist ein Fehler aufgetreten. <translation>Beim Löschen der Dateien auf dem Revolution Pi ist ein Fehler aufgetreten.
Hochladen abgebrochen! Versuche es erneut.</translation> Hochladen abgebrochen! Versuche es erneut.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="552"/> <location filename="../revpiprogram.py" line="544"/>
<source>The PLC program was transferred successfully.</source> <source>The PLC program was transferred successfully.</source>
<translation>Das SPS Programm wurde erfolgreich übertragen.</translation> <translation>Das SPS Programm wurde erfolgreich übertragen.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="560"/> <location filename="../revpiprogram.py" line="552"/>
<source>Information</source> <source>Information</source>
<translation>Information</translation> <translation>Information</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="560"/> <location filename="../revpiprogram.py" line="552"/>
<source>Could not find the selected PLC start program in uploaded files. <source>Could not find the selected PLC start program in uploaded files.
This is not an error, if the file was already on the Revolution Pi. Check PLC start program field</source> This is not an error, if the file was already on the Revolution Pi. Check PLC start program field</source>
<translation>Konnte eingestelltes SPS Starprogramm in hochgeladenen Dateien nicht finden. <translation>Konnte eingestelltes SPS Starprogramm in hochgeladenen Dateien nicht finden.
Dies ist kein Fehler, wenn das SPS Startprogramm bereits auf dem Rev Pi ist. Prüfe SPS Programm Einstellungen</translation> Dies ist kein Fehler, wenn das SPS Startprogramm bereits auf dem Rev Pi ist. Prüfe SPS Programm Einstellungen</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="573"/> <location filename="../revpiprogram.py" line="565"/>
<source>There is no piCtory configuration in this archive.</source> <source>There is no piCtory configuration in this archive.</source>
<translation>Kann keine piCtory Konfiguration im Archiv finden.</translation> <translation>Kann keine piCtory Konfiguration im Archiv finden.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="580"/> <location filename="../revpiprogram.py" line="572"/>
<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>
<translation>Der Revolution Pi konnte Teile der Übertragung nicht verarbeiten.</translation> <translation>Der Revolution Pi konnte Teile der Übertragung nicht verarbeiten.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="587"/> <location filename="../revpiprogram.py" line="579"/>
<source>Errors occurred during transmission.</source> <source>Errors occurred during transmission.</source>
<translation>Fehler bei Übertragung aufgetreten.</translation> <translation>Fehler bei Übertragung aufgetreten.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="606"/> <location filename="../revpiprogram.py" line="598"/>
<source>Save piCtory file...</source> <source>Save piCtory file...</source>
<translation>piCtory Datei speichern...</translation> <translation>piCtory Datei speichern...</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="646"/> <location filename="../revpiprogram.py" line="638"/>
<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>
<message> <message>
<location filename="../revpiprogram.py" line="625"/> <location filename="../revpiprogram.py" line="617"/>
<source>Could not load piCtory file from Revolution Pi.</source> <source>Could not load piCtory file from Revolution Pi.</source>
<translation>Kann piCtory Konfiguration nicht vom Revolution Pi laden.</translation> <translation>Kann piCtory Konfiguration nicht vom Revolution Pi laden.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="635"/> <location filename="../revpiprogram.py" line="627"/>
<source>piCtory configuration successfully loaded and saved to: <source>piCtory configuration successfully loaded and saved to:
{0}.</source> {0}.</source>
<translation>piCtory Konfiguration erfolgreich geladen und gespeichert als: <translation>piCtory Konfiguration erfolgreich geladen und gespeichert als:
{0}.</translation> {0}.</translation>
</message> </message>
<message> <message>
<location filename="../revpiprogram.py" line="646"/> <location filename="../revpiprogram.py" line="638"/>
<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="667"/> <location filename="../revpiprogram.py" line="659"/>
<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="667"/> <location filename="../revpiprogram.py" line="659"/>
<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="688"/> <location filename="../revpiprogram.py" line="680"/>
<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="698"/> <location filename="../revpiprogram.py" line="690"/>
<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:
@@ -1556,6 +1561,16 @@ applicable law.
<source>You have to configure your Revolution Pi to accept this connections</source> <source>You have to configure your Revolution Pi to accept this connections</source>
<translation>Sie müssen den Revolution Pi für diese Art der Verbindung konfigurieren</translation> <translation>Sie müssen den Revolution Pi für diese Art der Verbindung konfigurieren</translation>
</message> </message>
<message>
<location filename="../../../ui_dev/avahisearch.ui" line="156"/>
<source>Connect</source>
<translation>Verbinden</translation>
</message>
<message>
<location filename="../../../ui_dev/avahisearch.ui" line="159"/>
<source>Connect to Revoluton Pi</source>
<translation>Mit Revolution Pi verbinden</translation>
</message>
</context> </context>
<context> <context>
<name>diag_simulator</name> <name>diag_simulator</name>

53
src/revpicommander/revpicommander.py
View File

@@ -5,10 +5,10 @@
__author__ = "Sven Sager" __author__ = "Sven Sager"
__copyright__ = "Copyright (C) 2018 Sven Sager" __copyright__ = "Copyright (C) 2018 Sven Sager"
__license__ = "GPLv3" __license__ = "GPLv3"
__version__ = "0.9.10rc1" __version__ = "0.9.10rc2"
import webbrowser import webbrowser
from os.path import basename, dirname, join from os.path import dirname, join
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
@@ -17,6 +17,7 @@ from . import proginit as pi
from . import revpilogfile from . import revpilogfile
from .avahisearch import AvahiSearch from .avahisearch import AvahiSearch
from .debugcontrol import DebugControl from .debugcontrol import DebugControl
from .helper import RevPiSettings
from .revpifiles import RevPiFiles from .revpifiles import RevPiFiles
from .revpiinfo import RevPiInfo from .revpiinfo import RevPiInfo
from .revpioption import RevPiOption from .revpioption import RevPiOption
@@ -61,14 +62,14 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
helper.cm.connection_error_observed.connect(self.on_cm_connection_error_observed) helper.cm.connection_error_observed.connect(self.on_cm_connection_error_observed)
helper.cm.status_changed.connect(self.on_cm_status_changed) helper.cm.status_changed.connect(self.on_cm_status_changed)
self.restoreGeometry(helper.settings.value("geo", b'')) self.restoreGeometry(helper.settings.value("revpicommander/geo", b''))
self.setWindowFlag(QtCore.Qt.WindowMaximizeButtonHint, False) self.setWindowFlag(QtCore.Qt.WindowMaximizeButtonHint, False)
def closeEvent(self, a0: QtGui.QCloseEvent) -> None: def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
pi.logger.debug("RevPiCommander.closeEvent") pi.logger.debug("RevPiCommander.closeEvent")
helper.cm.pyload_disconnect() helper.cm.pyload_disconnect()
helper.settings.setValue("geo", self.saveGeometry()) helper.settings.setValue("revpicommander/geo", self.saveGeometry())
def _set_gui_control_states(self): def _set_gui_control_states(self):
"""Setup states of actions and buttons.""" """Setup states of actions and buttons."""
@@ -96,9 +97,6 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# region # REGION: Connection management # region # REGION: Connection management
def _pyload_connect(self, settings_index: int) -> None:
helper.cm.pyload_connect(settings_index, self)
@QtCore.pyqtSlot(str) @QtCore.pyqtSlot(str)
def on_cm_connection_error_observed(self, message: str): def on_cm_connection_error_observed(self, message: str):
""" """
@@ -148,8 +146,8 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
helper.cm.simulating_procimg, helper.cm.simulating_procimg,
)) ))
else: else:
self.txt_host.setText(helper.cm.name) self.txt_host.setText(helper.cm.settings.name)
self.txt_connection.setText(helper.cm.address) self.txt_connection.setText(helper.cm.settings.address)
self.win_files = RevPiFiles(self) self.win_files = RevPiFiles(self)
@QtCore.pyqtSlot(str, str) @QtCore.pyqtSlot(str, str)
@@ -169,34 +167,27 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
self.men_connections.clear() self.men_connections.clear()
self.dict_men_connections_subfolder.clear() self.dict_men_connections_subfolder.clear()
for i in range(helper.settings.beginReadArray("connections")): for settings in helper.all_revpi_settings(): # type: RevPiSettings
helper.settings.setArrayIndex(i) if settings.folder:
if settings.folder not in self.dict_men_connections_subfolder:
if helper.settings.value("folder"):
if helper.settings.value("folder") not in self.dict_men_connections_subfolder:
men_sub = QtWidgets.QMenu(self.men_connections) men_sub = QtWidgets.QMenu(self.men_connections)
men_sub.setTitle(helper.settings.value("folder")) men_sub.setTitle(settings.folder)
self.dict_men_connections_subfolder[helper.settings.value("folder")] = men_sub self.dict_men_connections_subfolder[settings.folder] = men_sub
self.men_connections.addMenu(men_sub) self.men_connections.addMenu(men_sub)
parent_menu = self.dict_men_connections_subfolder[helper.settings.value("folder")] parent_menu = self.dict_men_connections_subfolder[settings.folder]
else: else:
parent_menu = self.men_connections parent_menu = self.men_connections
display_name = helper.settings.value("name") display_name = settings.name
if helper.settings.value("ssh_use_tunnel", False, bool): if settings.ssh_use_tunnel:
display_name += " (SSH)" display_name += " (SSH)"
act = QtWidgets.QAction(parent_menu) act = QtWidgets.QAction(parent_menu)
act.setText(display_name) act.setText(display_name)
act.setData(i) act.setData(settings)
act.setToolTip("{0}:{1}".format( act.setToolTip("{0}:{1}".format(settings.address, settings.port))
helper.settings.value("address"),
helper.settings.value("port"),
))
parent_menu.addAction(act) parent_menu.addAction(act)
helper.settings.endArray()
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_act_connections_triggered(self): def on_act_connections_triggered(self):
"""Edit saved connections to Revolution Pi devices.""" """Edit saved connections to Revolution Pi devices."""
@@ -207,8 +198,11 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
def on_act_search_triggered(self): def on_act_search_triggered(self):
"""Search for Revolution Pi with zero conf.""" """Search for Revolution Pi with zero conf."""
if self.diag_search.exec() == QtWidgets.QDialog.Accepted: if self.diag_search.exec() == QtWidgets.QDialog.Accepted:
if self.diag_search.connect_index >= 0: if self.diag_search.connect_settings:
self._pyload_connect(self.diag_search.connect_index) if self.diag_search.just_save:
self.diag_connections.exec_with_presets(self.diag_search.connect_settings)
else:
helper.cm.pyload_connect(self.diag_search.connect_settings, self)
self._load_men_connections() self._load_men_connections()
@@ -367,7 +361,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
@QtCore.pyqtSlot(QtWidgets.QAction) @QtCore.pyqtSlot(QtWidgets.QAction)
def on_men_connections_triggered(self, action: QtWidgets.QAction): def on_men_connections_triggered(self, action: QtWidgets.QAction):
"""A connection is selected in the men_connections menu.""" """A connection is selected in the men_connections menu."""
self._pyload_connect(action.data()) helper.cm.pyload_connect(action.data(), self)
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_act_webpage_triggered(self): def on_act_webpage_triggered(self):
@@ -506,4 +500,5 @@ def main() -> int:
if __name__ == "__main__": if __name__ == "__main__":
import sys import sys
sys.exit(main()) sys.exit(main())

29
src/revpicommander/revpifiles.py
View File

@@ -43,14 +43,13 @@ class UploadFiles(BackgroundWorker):
progress_counter += 1 progress_counter += 1
# Remove base dir of file to set relative for PyLoad # Remove base dir of file to set relative for PyLoad
send_name = file_name.replace(helper.cm.develop_watch_path, "")[1:] send_name = file_name.replace(helper.cm.settings.watch_path, "")[1:]
self.status_message.emit(send_name) self.status_message.emit(send_name)
# Check whether this is the auto start program # Check whether this is the auto start program
if send_name == opt_program: if send_name == opt_program:
self.plc_program_included = True self.plc_program_included = True
# Transfer file # Transfer file
try: try:
with open(file_name, "rb") as fh: with open(file_name, "rb") as fh:
@@ -83,7 +82,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
self.dc_settings = {} self.dc_settings = {}
self.tree_files_counter = 0 self.tree_files_counter = 0
self.tree_files_counter_max = 10000 self.tree_files_counter_max = 10000
self.lbl_path_local.setText(helper.cm.develop_watch_path or self.tr("Please select...")) self.lbl_path_local.setText(helper.cm.settings.watch_path or self.tr("Please select..."))
self.lbl_path_local.setToolTip(self.lbl_path_local.text()) self.lbl_path_local.setToolTip(self.lbl_path_local.text())
self.btn_all.setEnabled(False) self.btn_all.setEnabled(False)
@@ -91,7 +90,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
self.btn_to_right.setEnabled(False) self.btn_to_right.setEnabled(False)
self.btn_delete_revpi.setEnabled(False) self.btn_delete_revpi.setEnabled(False)
if helper.cm.develop_watch_path: if helper.cm.settings.watch_path:
self._load_files_local(True) self._load_files_local(True)
if helper.cm.connected: if helper.cm.connected:
self._load_files_revpi(True) self._load_files_revpi(True)
@@ -176,7 +175,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
if "plcdownload_file" not in helper.cm.xml_funcs: if "plcdownload_file" not in helper.cm.xml_funcs:
self.btn_to_left.setEnabled(False) self.btn_to_left.setEnabled(False)
self.btn_to_left.setToolTip(self.tr("The RevPiPyLoad version on the Revolution Pi is to old.")) self.btn_to_left.setToolTip(self.tr("The RevPiPyLoad version on the Revolution Pi is to old."))
elif not helper.cm.develop_watch_path: elif not helper.cm.settings.watch_path:
self.btn_to_left.setEnabled(False) self.btn_to_left.setEnabled(False)
self.btn_to_left.setToolTip(self.tr("Choose a local directory first.")) self.btn_to_left.setToolTip(self.tr("Choose a local directory first."))
else: else:
@@ -231,7 +230,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_tree_files_local_itemSelectionChanged(self): def on_tree_files_local_itemSelectionChanged(self):
self.__item_selection_changed(self.tree_files_local) self.__item_selection_changed(self.tree_files_local)
helper.cm.develop_watch_files = self.file_list_local() helper.cm.settings.watch_files = self.file_list_local()
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_tree_files_revpi_itemSelectionChanged(self): def on_tree_files_revpi_itemSelectionChanged(self):
@@ -288,7 +287,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
else: else:
self.tree_files_local.addTopLevelItem(item) self.tree_files_local.addTopLevelItem(item)
item.setSelected(de.path in helper.cm.develop_watch_files) item.setSelected(de.path in helper.cm.settings.watch_files)
self._parent_selection_state(item) self._parent_selection_state(item)
def _load_files_local(self, silent=False): def _load_files_local(self, silent=False):
@@ -302,7 +301,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
self.tree_files_counter = 0 self.tree_files_counter = 0
self.tree_files_local.blockSignals(True) self.tree_files_local.blockSignals(True)
self.tree_files_local.clear() self.tree_files_local.clear()
self.__insert_files_local(helper.cm.develop_watch_path) self.__insert_files_local(helper.cm.settings.watch_path)
self.tree_files_local.sortItems(0, QtCore.Qt.AscendingOrder) self.tree_files_local.sortItems(0, QtCore.Qt.AscendingOrder)
self.tree_files_local.blockSignals(False) self.tree_files_local.blockSignals(False)
@@ -446,7 +445,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
diag_folder = QtWidgets.QFileDialog( diag_folder = QtWidgets.QFileDialog(
self, self.tr("Select folder..."), self, self.tr("Select folder..."),
helper.cm.develop_watch_path, helper.cm.settings.watch_path,
) )
diag_folder.setFileMode(QtWidgets.QFileDialog.DirectoryOnly) diag_folder.setFileMode(QtWidgets.QFileDialog.DirectoryOnly)
if diag_folder.exec() != QtWidgets.QFileDialog.Accepted: if diag_folder.exec() != QtWidgets.QFileDialog.Accepted:
@@ -460,14 +459,14 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
"Can not access the folder '{0}' to read files." "Can not access the folder '{0}' to read files."
) )
) )
helper.cm.develop_watch_files = [] helper.cm.settings.watch_files = []
helper.cm.develop_watch_path = "" helper.cm.settings.watch_path = ""
return return
self.lbl_path_local.setText(selected_dir) self.lbl_path_local.setText(selected_dir)
self.lbl_path_local.setToolTip(self.lbl_path_local.text()) self.lbl_path_local.setToolTip(self.lbl_path_local.text())
helper.cm.develop_watch_path = selected_dir helper.cm.settings.watch_path = selected_dir
helper.cm.develop_watch_files = [] helper.cm.settings.watch_files = []
self._load_files_local(False) self._load_files_local(False)
@@ -511,7 +510,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
).format(file_name) ).format(file_name)
) )
else: else:
file_name = os.path.join(helper.cm.develop_watch_path, file_name) file_name = os.path.join(helper.cm.settings.watch_path, file_name)
if override is None and os.path.exists(file_name): if override is None and os.path.exists(file_name):
rc_diag = QtWidgets.QMessageBox.question( rc_diag = QtWidgets.QMessageBox.question(
self, self.tr("Override files..."), self.tr( self, self.tr("Override files..."), self.tr(
@@ -530,7 +529,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
os.makedirs(os.path.dirname(file_name), exist_ok=True) os.makedirs(os.path.dirname(file_name), exist_ok=True)
file_data = gzip.decompress(rc) file_data = gzip.decompress(rc)
with open(os.path.join(helper.cm.develop_watch_path, file_name), "wb") as fh: with open(os.path.join(helper.cm.settings.watch_path, file_name), "wb") as fh:
fh.write(file_data) fh.write(file_data)
self._load_files_local() self._load_files_local()

175
src/revpicommander/revpiplclist.py
View File

@@ -8,8 +8,9 @@ from enum import IntEnum
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from . import helper
from . import proginit as pi from . import proginit as pi
from .helper import WidgetData, settings from .helper import RevPiSettings, WidgetData
from .ui.revpiplclist_ui import Ui_diag_connections from .ui.revpiplclist_ui import Ui_diag_connections
@@ -41,38 +42,22 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
self.tre_connections.clear() self.tre_connections.clear()
self.cbb_folder.clear() self.cbb_folder.clear()
self.cbb_folder.addItem("") self.cbb_folder.addItem("")
for i in range(settings.beginReadArray("connections")):
settings.setArrayIndex(i) # Get length of array and close it, the RevPiSettings-class need it
count_settings = helper.settings.beginReadArray("connections")
helper.settings.endArray()
for i in range(count_settings):
settings = RevPiSettings(i)
con_item = QtWidgets.QTreeWidgetItem(NodeType.CON) con_item = QtWidgets.QTreeWidgetItem(NodeType.CON)
con_item.setIcon(0, QtGui.QIcon(":/main/ico/cpu.ico")) con_item.setIcon(0, QtGui.QIcon(":/main/ico/cpu.ico"))
con_item.setText(0, settings.value("name", "Revolution Pi", str)) con_item.setText(0, settings.name)
con_item.setText(1, settings.value("address", "127.0.0.1", str)) con_item.setText(1, settings.address)
con_item.setData(0, WidgetData.port, settings.value("port", self.__default_port, int))
con_item.setData(0, WidgetData.timeout, settings.value("timeout", 5, int))
con_item.setData(0, WidgetData.ssh_use_tunnel, settings.value("ssh_use_tunnel", False, bool)) con_item.setData(0, WidgetData.revpi_settings, settings)
con_item.setData(0, WidgetData.ssh_port, settings.value("ssh_port", 22, int))
con_item.setData(0, WidgetData.ssh_user, settings.value("ssh_user", "pi", str))
con_item.setData(0, WidgetData.last_dir_upload, settings.value("last_dir_upload")) folder = settings.folder
con_item.setData(0, WidgetData.last_file_upload, settings.value("last_file_upload"))
con_item.setData(0, WidgetData.last_dir_pictory, settings.value("last_dir_pictory"))
con_item.setData(0, WidgetData.last_dir_picontrol, settings.value("last_dir_picontrol"))
con_item.setData(0, WidgetData.last_dir_selected, settings.value("last_dir_selected"))
con_item.setData(0, WidgetData.last_pictory_file, settings.value("last_pictory_file"))
con_item.setData(0, WidgetData.last_tar_file, settings.value("last_tar_file"))
con_item.setData(0, WidgetData.last_zip_file, settings.value("last_zip_file"))
con_item.setData(0, WidgetData.watch_files, settings.value("watch_files"))
con_item.setData(0, WidgetData.watch_path, settings.value("watch_path"))
try:
# Bytes with QSettings are a little difficult sometimes
con_item.setData(0, WidgetData.debug_geos, settings.value("debug_geos"))
except Exception:
# Just drop the geos of IO windows
pass
folder = settings.value("folder", "", str)
if folder: if folder:
sub_folder = self._get_folder_item(folder) sub_folder = self._get_folder_item(folder)
if sub_folder is None: if sub_folder is None:
@@ -86,10 +71,8 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
else: else:
self.tre_connections.addTopLevelItem(con_item) self.tre_connections.addTopLevelItem(con_item)
settings.endArray()
self.tre_connections.expandAll() self.tre_connections.expandAll()
self.changes = True self.changes = False
if self.tre_connections.topLevelItemCount() == 0: if self.tre_connections.topLevelItemCount() == 0:
self._edit_state() self._edit_state()
@@ -97,57 +80,19 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
def accept(self) -> None: def accept(self) -> None:
pi.logger.debug("RevPiPlcList.accept") pi.logger.debug("RevPiPlcList.accept")
def set_settings(node: QtWidgets.QTreeWidgetItem): helper.settings.remove("connections")
parent = node.parent()
settings.setValue("address", node.text(1))
settings.setValue("folder", parent.text(0) if parent else "")
settings.setValue("name", node.text(0))
settings.setValue("port", node.data(0, WidgetData.port))
settings.setValue("timeout", node.data(0, WidgetData.timeout))
settings.setValue("ssh_use_tunnel", node.data(0, WidgetData.ssh_use_tunnel))
settings.setValue("ssh_port", node.data(0, WidgetData.ssh_port))
settings.setValue("ssh_user", node.data(0, WidgetData.ssh_user))
if node.data(0, WidgetData.last_dir_upload):
settings.setValue("last_dir_upload", node.data(0, WidgetData.last_dir_upload))
if node.data(0, WidgetData.last_file_upload):
settings.setValue("last_file_upload", node.data(0, WidgetData.last_file_upload))
if node.data(0, WidgetData.last_dir_pictory):
settings.setValue("last_dir_pictory", node.data(0, WidgetData.last_dir_pictory))
if node.data(0, WidgetData.last_dir_picontrol):
settings.setValue("last_dir_picontrol", node.data(0, WidgetData.last_dir_picontrol))
if node.data(0, WidgetData.last_dir_selected):
settings.setValue("last_dir_selected", node.data(0, WidgetData.last_dir_selected))
if node.data(0, WidgetData.last_pictory_file):
settings.setValue("last_pictory_file", node.data(0, WidgetData.last_pictory_file))
if node.data(0, WidgetData.last_tar_file):
settings.setValue("last_tar_file", node.data(0, WidgetData.last_tar_file))
if node.data(0, WidgetData.last_zip_file):
settings.setValue("last_zip_file", node.data(0, WidgetData.last_zip_file))
if node.data(0, WidgetData.watch_files):
settings.setValue("watch_files", node.data(0, WidgetData.watch_files))
if node.data(0, WidgetData.watch_path):
settings.setValue("watch_path", node.data(0, WidgetData.watch_path))
if node.data(0, WidgetData.debug_geos):
settings.setValue("debug_geos", node.data(0, WidgetData.debug_geos))
settings.remove("connections")
settings.beginWriteArray("connections")
counter_index = 0
for i in range(self.tre_connections.topLevelItemCount()): for i in range(self.tre_connections.topLevelItemCount()):
root_item = self.tre_connections.topLevelItem(i) root_item = self.tre_connections.topLevelItem(i)
if root_item.type() == NodeType.DIR: if root_item.type() == NodeType.DIR:
for k in range(root_item.childCount()): for k in range(root_item.childCount()):
settings.setArrayIndex(counter_index) revpi_settings = root_item.child(k).data(0, WidgetData.revpi_settings) # type: RevPiSettings
set_settings(root_item.child(k)) revpi_settings.folder = root_item.text(0)
counter_index += 1 revpi_settings.save_settings()
elif root_item.type() == NodeType.CON: elif root_item.type() == NodeType.CON:
settings.setArrayIndex(counter_index) revpi_settings = root_item.data(0, WidgetData.revpi_settings) # type: RevPiSettings
set_settings(root_item) revpi_settings.folder = ""
counter_index += 1 revpi_settings.save_settings()
settings.endArray()
self.changes = False self.changes = False
super(RevPiPlcList, self).accept() super(RevPiPlcList, self).accept()
@@ -170,6 +115,17 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
self._load_settings() self._load_settings()
return super(RevPiPlcList, self).exec() return super(RevPiPlcList, self).exec()
def exec_with_presets(self, presets: RevPiSettings) -> int:
"""
Start dialog with new created settings object and presets.
:param presets: Use these settings as preset
:return: Dialog status
"""
self._load_settings()
self.on_btn_add_pressed(presets)
return super(RevPiPlcList, self).exec()
@QtCore.pyqtSlot(QtWidgets.QAbstractButton) @QtCore.pyqtSlot(QtWidgets.QAbstractButton)
def on_btn_box_clicked(self, button: QtWidgets.QAbstractButton): def on_btn_box_clicked(self, button: QtWidgets.QAbstractButton):
if self.btn_box.buttonRole(button) == QtWidgets.QDialogButtonBox.DestructiveRole: if self.btn_box.buttonRole(button) == QtWidgets.QDialogButtonBox.DestructiveRole:
@@ -179,6 +135,7 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
# region # REGION: Connection management # region # REGION: Connection management
def _edit_state(self): def _edit_state(self):
"""Set enabled status of all controls, depending on selected item."""
item = self.tre_connections.currentItem() item = self.tre_connections.currentItem()
if item is None: if item is None:
up_ok = False up_ok = False
@@ -232,6 +189,7 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
if 0 <= new_index < dir_item.childCount(): if 0 <= new_index < dir_item.childCount():
item = dir_item.takeChild(index) item = dir_item.takeChild(index)
dir_item.insertChild(new_index, item) dir_item.insertChild(new_index, item)
self.tre_connections.expandItem(dir_item)
else: else:
index = self.tre_connections.indexOfTopLevelItem(item) index = self.tre_connections.indexOfTopLevelItem(item)
new_index = index + count new_index = index + count
@@ -249,22 +207,25 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
self._edit_state() self._edit_state()
if current and current.type() == NodeType.CON: if current and current.type() == NodeType.CON:
self.__current_item = current self.__current_item = current
self.txt_name.setText(current.text(0))
self.txt_address.setText(current.text(1)) settings = current.data(0, WidgetData.revpi_settings) # type: RevPiSettings
self.sbx_port.setValue(current.data(0, WidgetData.port)) self.txt_name.setText(settings.name)
self.sbx_timeout.setValue(current.data(0, WidgetData.timeout)) self.txt_address.setText(settings.address)
self.sbx_port.setValue(settings.port)
self.sbx_timeout.setValue(settings.timeout)
if current.parent() is None: if current.parent() is None:
self.cbb_folder.setCurrentIndex(0) self.cbb_folder.setCurrentIndex(0)
else: else:
self.cbb_folder.setCurrentText(current.parent().text(0)) self.cbb_folder.setCurrentText(current.parent().text(0))
self.cbx_ssh_use_tunnel.setChecked(current.data(0, WidgetData.ssh_use_tunnel)) self.cbx_ssh_use_tunnel.setChecked(settings.ssh_use_tunnel)
self.sbx_ssh_port.setValue(current.data(0, WidgetData.ssh_port)) self.sbx_ssh_port.setValue(settings.ssh_port)
self.txt_ssh_user.setText(current.data(0, WidgetData.ssh_user)) self.txt_ssh_user.setText(settings.ssh_user)
elif current and current.type() == NodeType.DIR: elif current and current.type() == NodeType.DIR:
self.__current_item = current self.__current_item = current
self.cbb_folder.setCurrentText(current.text(0)) self.cbb_folder.setCurrentText(current.text(0))
else: else:
self.__current_item = QtWidgets.QTreeWidgetItem() self.__current_item = QtWidgets.QTreeWidgetItem()
self.cbb_folder.setCurrentText(current.text(0) if current else "") self.cbb_folder.setCurrentText(current.text(0) if current else "")
@@ -292,23 +253,21 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
self._edit_state() self._edit_state()
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def on_btn_add_pressed(self): def on_btn_add_pressed(self, settings_preset: RevPiSettings = None):
"""Create new element.""" """Create new element."""
self.__current_item = QtWidgets.QTreeWidgetItem(NodeType.CON) settings = settings_preset or RevPiSettings()
self.__current_item.setIcon(0, QtGui.QIcon(":/main/ico/cpu.ico")) new_item = QtWidgets.QTreeWidgetItem(NodeType.CON)
self.__current_item.setText(0, self.__default_name) new_item.setIcon(0, QtGui.QIcon(":/main/ico/cpu.ico"))
self.__current_item.setData(0, WidgetData.port, self.__default_port) new_item.setText(0, settings.name)
self.__current_item.setData(0, WidgetData.timeout, 5) new_item.setData(0, WidgetData.revpi_settings, settings)
self.__current_item.setData(0, WidgetData.ssh_use_tunnel, False)
self.__current_item.setData(0, WidgetData.ssh_port, 22)
self.__current_item.setData(0, WidgetData.ssh_user, "pi")
sub_folder = self._get_folder_item(self.cbb_folder.currentText()) sub_folder = self._get_folder_item(self.cbb_folder.currentText())
if sub_folder: if sub_folder:
sub_folder.addChild(self.__current_item) sub_folder.addChild(new_item)
else: else:
self.tre_connections.addTopLevelItem(self.__current_item) self.tre_connections.addTopLevelItem(new_item)
self.tre_connections.setCurrentItem(self.__current_item) # This will load all settings and prepare widgets
self.tre_connections.setCurrentItem(new_item)
self.txt_name.setFocus() self.txt_name.setFocus()
self.txt_name.selectAll() self.txt_name.selectAll()
@@ -317,42 +276,58 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
if self.__current_item.type() != NodeType.CON: if self.__current_item.type() != NodeType.CON:
return return
self.__current_item.setText(0, text) self.__current_item.setText(0, text)
settings = self.__current_item.data(0, WidgetData.revpi_settings) # type: RevPiSettings
settings.name = text
self.changes = True
@QtCore.pyqtSlot(str) @QtCore.pyqtSlot(str)
def on_txt_address_textEdited(self, text): def on_txt_address_textEdited(self, text):
if self.__current_item.type() != NodeType.CON: if self.__current_item.type() != NodeType.CON:
return return
self.__current_item.setText(1, text) self.__current_item.setText(1, text)
settings = self.__current_item.data(0, WidgetData.revpi_settings) # type: RevPiSettings
settings.address = text
self.changes = True
@QtCore.pyqtSlot(int) @QtCore.pyqtSlot(int)
def on_sbx_port_valueChanged(self, value: int): def on_sbx_port_valueChanged(self, value: int):
if self.__current_item.type() != NodeType.CON: if self.__current_item.type() != NodeType.CON:
return return
self.__current_item.setData(0, WidgetData.port, value) settings = self.__current_item.data(0, WidgetData.revpi_settings) # type: RevPiSettings
settings.port = value
self.changes = True
@QtCore.pyqtSlot(int) @QtCore.pyqtSlot(int)
def on_sbx_timeout_valueChanged(self, value: int): def on_sbx_timeout_valueChanged(self, value: int):
if self.__current_item.type() != NodeType.CON: if self.__current_item.type() != NodeType.CON:
return return
self.__current_item.setData(0, WidgetData.timeout, value) settings = self.__current_item.data(0, WidgetData.revpi_settings) # type: RevPiSettings
settings.timeout = value
self.changes = True
@QtCore.pyqtSlot(int) @QtCore.pyqtSlot(int)
def on_cbx_ssh_use_tunnel_stateChanged(self, check_state: int): def on_cbx_ssh_use_tunnel_stateChanged(self, check_state: int):
if self.__current_item.type() != NodeType.CON: if self.__current_item.type() != NodeType.CON:
return return
self.__current_item.setData(0, WidgetData.ssh_use_tunnel, check_state == QtCore.Qt.CheckState.Checked) settings = self.__current_item.data(0, WidgetData.revpi_settings) # type: RevPiSettings
settings.ssh_use_tunnel = check_state == QtCore.Qt.CheckState.Checked
self.changes = True
@QtCore.pyqtSlot(int) @QtCore.pyqtSlot(int)
def on_sbx_ssh_port_valueChanged(self, value: int): def on_sbx_ssh_port_valueChanged(self, value: int):
if self.__current_item.type() != NodeType.CON: if self.__current_item.type() != NodeType.CON:
return return
self.__current_item.setData(0, WidgetData.ssh_port, value) settings = self.__current_item.data(0, WidgetData.revpi_settings) # type: RevPiSettings
settings.ssh_port = value
self.changes = True
@QtCore.pyqtSlot(str) @QtCore.pyqtSlot(str)
def on_txt_ssh_user_textEdited(self, text): def on_txt_ssh_user_textEdited(self, text):
if self.__current_item.type() != NodeType.CON: if self.__current_item.type() != NodeType.CON:
return return
self.__current_item.setData(0, WidgetData.ssh_user, text) settings = self.__current_item.data(0, WidgetData.revpi_settings) # type: RevPiSettings
settings.ssh_user = text
self.changes = True
@QtCore.pyqtSlot(str) @QtCore.pyqtSlot(str)
def on_cbb_folder_editTextChanged(self, text: str): def on_cbb_folder_editTextChanged(self, text: str):

43
src/revpicommander/revpiprogram.py
View File

@@ -58,8 +58,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
:return: True, if unsaved changes was found :return: True, if unsaved changes was found
""" """
return \ return self.cbb_plcprogram.currentText() != self.dc.get("plcprogram", "") or \
self.cbb_plcprogram.currentText() != self.dc.get("plcprogram", "") or \
self.txt_plcarguments.text() != self.dc.get("plcarguments", "") or \ self.txt_plcarguments.text() != self.dc.get("plcarguments", "") or \
self.rbn_pythonversion_2.isChecked() != (self.dc.get("pythonversion", 3) == 2) or \ self.rbn_pythonversion_2.isChecked() != (self.dc.get("pythonversion", 3) == 2) or \
self.rbn_pythonversion_3.isChecked() != (self.dc.get("pythonversion", 3) == 3) or \ self.rbn_pythonversion_3.isChecked() != (self.dc.get("pythonversion", 3) == 3) or \
@@ -213,7 +212,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
) )
) )
elif ec == 0: elif ec == 0:
helper.cm.program_last_pictory_file = filename helper.cm.settings.last_pictory_file = filename
if ask == QtWidgets.QMessageBox.Yes: if ask == QtWidgets.QMessageBox.Yes:
QtWidgets.QMessageBox.information( QtWidgets.QMessageBox.information(
self, self.tr("Success"), self.tr( self, self.tr("Success"), self.tr(
@@ -324,16 +323,11 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
if not helper.cm.connected: if not helper.cm.connected:
return return
selected_dir = ""
if self.cbb_format.currentIndex() == 0: if self.cbb_format.currentIndex() == 0:
# Save files as zip archive # Save files as zip archive
diag_save = QtWidgets.QFileDialog( diag_save = QtWidgets.QFileDialog(
self, self.tr("Save ZIP archive..."), self, self.tr("Save ZIP archive..."),
os.path.join( helper.cm.settings.last_zip_file or "{0}.zip".format(helper.cm.settings.name),
helper.cm.program_last_zip_file,
"{0}.zip".format(helper.cm.name)
),
self.tr("ZIP archive (*.zip);;All files (*.*)") self.tr("ZIP archive (*.zip);;All files (*.*)")
) )
diag_save.setAcceptMode(QtWidgets.QFileDialog.AcceptSave) diag_save.setAcceptMode(QtWidgets.QFileDialog.AcceptSave)
@@ -345,16 +339,13 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
filename = diag_save.selectedFiles()[0] filename = diag_save.selectedFiles()[0]
fh = open(filename, "wb") fh = open(filename, "wb")
helper.cm.program_last_zip_file = filename helper.cm.settings.last_zip_file = filename
elif self.cbb_format.currentIndex() == 1: elif self.cbb_format.currentIndex() == 1:
# Save files as TarGz archive # Save files as TarGz archive
diag_save = QtWidgets.QFileDialog( diag_save = QtWidgets.QFileDialog(
self, self.tr("Save TGZ archive..."), self, self.tr("Save TGZ archive..."),
os.path.join( helper.cm.settings.last_tar_file or "{0}.tgz".format(helper.cm.settings.name),
helper.cm.program_last_tar_file,
"{0}.tgz".format(helper.cm.name)
),
self.tr("TGZ archive (*.tgz);;All files (*.*)") self.tr("TGZ archive (*.tgz);;All files (*.*)")
) )
diag_save.setAcceptMode(QtWidgets.QFileDialog.AcceptSave) diag_save.setAcceptMode(QtWidgets.QFileDialog.AcceptSave)
@@ -366,7 +357,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
filename = diag_save.selectedFiles()[0] filename = diag_save.selectedFiles()[0]
fh = open(filename, "wb") fh = open(filename, "wb")
helper.cm.program_last_tar_file = filename helper.cm.settings.last_tar_file = filename
else: else:
# Other indexes are not allowed for download # Other indexes are not allowed for download
@@ -426,7 +417,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
# Upload zip archive content # Upload zip archive content
diag_open = QtWidgets.QFileDialog( diag_open = QtWidgets.QFileDialog(
self, self.tr("Upload content of ZIP archive..."), self, self.tr("Upload content of ZIP archive..."),
helper.cm.program_last_file_upload, helper.cm.settings.last_file_upload,
self.tr("ZIP archive (*.zip);;All files (*.*)") self.tr("ZIP archive (*.zip);;All files (*.*)")
) )
diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen) diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen)
@@ -438,7 +429,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
return return
filename = diag_open.selectedFiles()[0] filename = diag_open.selectedFiles()[0]
helper.cm.program_last_file_upload = filename helper.cm.settings.last_file_upload = filename
if zipfile.is_zipfile(filename): if zipfile.is_zipfile(filename):
dirtmp = mkdtemp() dirtmp = mkdtemp()
fhz = zipfile.ZipFile(filename) fhz = zipfile.ZipFile(filename)
@@ -460,7 +451,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
# Upload TarGz content # Upload TarGz content
diag_open = QtWidgets.QFileDialog( diag_open = QtWidgets.QFileDialog(
self, self.tr("Upload content of TAR archive..."), self, self.tr("Upload content of TAR archive..."),
helper.cm.program_last_file_upload, helper.cm.settings.last_file_upload,
self.tr("TAR archive (*.tgz);;All files (*.*)") self.tr("TAR archive (*.tgz);;All files (*.*)")
) )
diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen) diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen)
@@ -472,7 +463,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
return return
filename = diag_open.selectedFiles()[0] filename = diag_open.selectedFiles()[0]
helper.cm.program_last_file_upload = filename helper.cm.settings.last_file_upload = filename
if tarfile.is_tarfile(filename): if tarfile.is_tarfile(filename):
dirtmp = mkdtemp() dirtmp = mkdtemp()
fht = tarfile.open(filename) fht = tarfile.open(filename)
@@ -606,8 +597,8 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
diag_save = QtWidgets.QFileDialog( diag_save = QtWidgets.QFileDialog(
self, self.tr("Save piCtory file..."), self, self.tr("Save piCtory file..."),
os.path.join( os.path.join(
helper.cm.program_last_dir_pictory, helper.cm.settings.last_dir_pictory,
"{0}.rsc".format(helper.cm.name) "{0}.rsc".format(helper.cm.settings.name)
), ),
self.tr("piCtory file (*.rsc);;All files (*.*)") self.tr("piCtory file (*.rsc);;All files (*.*)")
) )
@@ -619,7 +610,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
return return
filename = diag_save.selectedFiles()[0] filename = diag_save.selectedFiles()[0]
helper.cm.program_last_dir_pictory = os.path.dirname(filename) helper.cm.settings.last_dir_pictory = os.path.dirname(filename)
bin_buffer = helper.cm.call_remote_function("get_pictoryrsc") # type: Binary bin_buffer = helper.cm.call_remote_function("get_pictoryrsc") # type: Binary
if bin_buffer is None: if bin_buffer is None:
QtWidgets.QMessageBox.critical( QtWidgets.QMessageBox.critical(
@@ -645,7 +636,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
diag_open = QtWidgets.QFileDialog( diag_open = QtWidgets.QFileDialog(
self, self.tr("Upload piCtory file..."), self, self.tr("Upload piCtory file..."),
helper.cm.program_last_pictory_file, helper.cm.settings.last_pictory_file or "{0}.rsc".format(helper.cm.settings.name),
self.tr("piCtory file (*.rsc);;All files (*.*)") self.tr("piCtory file (*.rsc);;All files (*.*)")
) )
diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen) diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen)
@@ -668,8 +659,8 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
self, self,
self.tr("Save piControl file..."), self.tr("Save piControl file..."),
os.path.join( os.path.join(
helper.cm.program_last_dir_picontrol, helper.cm.settings.last_dir_picontrol,
"{0}.img".format(helper.cm.name) "{0}.img".format(helper.cm.settings.name)
), ),
self.tr("Process image file (*.img);;All files (*.*)") self.tr("Process image file (*.img);;All files (*.*)")
) )
@@ -681,7 +672,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
return return
filename = diag_save.selectedFiles()[0] filename = diag_save.selectedFiles()[0]
helper.cm.program_last_dir_picontrol = os.path.dirname(filename) helper.cm.settings.last_dir_picontrol = os.path.dirname(filename)
bin_buffer = helper.cm.call_remote_function("get_procimg") # type: Binary bin_buffer = helper.cm.call_remote_function("get_procimg") # type: Binary
if bin_buffer is None: if bin_buffer is None:

1
src/revpicommander/sshauth.py
View File

@@ -15,6 +15,7 @@ class SSHAuthType(Enum):
PASS = "pass" PASS = "pass"
KEYS = "keys" KEYS = "keys"
class SSHAuth(QtWidgets.QDialog, Ui_diag_sshauth): class SSHAuth(QtWidgets.QDialog, Ui_diag_sshauth):
"""Version information window.""" """Version information window."""

4
src/revpicommander/ui/avahisearch_ui.py
View File

@@ -75,6 +75,8 @@ class Ui_diag_search(object):
self.act_connect_ssh.setObjectName("act_connect_ssh") self.act_connect_ssh.setObjectName("act_connect_ssh")
self.act_connect_xmlrpc = QtWidgets.QAction(diag_search) self.act_connect_xmlrpc = QtWidgets.QAction(diag_search)
self.act_connect_xmlrpc.setObjectName("act_connect_xmlrpc") self.act_connect_xmlrpc.setObjectName("act_connect_xmlrpc")
self.act_connect = QtWidgets.QAction(diag_search)
self.act_connect.setObjectName("act_connect")
self.retranslateUi(diag_search) self.retranslateUi(diag_search)
self.btn_box.rejected.connect(diag_search.reject) # type: ignore self.btn_box.rejected.connect(diag_search.reject) # type: ignore
@@ -99,6 +101,8 @@ class Ui_diag_search(object):
self.act_connect_ssh.setToolTip(_translate("diag_search", "Establish a connection via encrypted SSH tunnel")) self.act_connect_ssh.setToolTip(_translate("diag_search", "Establish a connection via encrypted SSH tunnel"))
self.act_connect_xmlrpc.setText(_translate("diag_search", "Connect via XML-RPC")) self.act_connect_xmlrpc.setText(_translate("diag_search", "Connect via XML-RPC"))
self.act_connect_xmlrpc.setToolTip(_translate("diag_search", "You have to configure your Revolution Pi to accept this connections")) self.act_connect_xmlrpc.setToolTip(_translate("diag_search", "You have to configure your Revolution Pi to accept this connections"))
self.act_connect.setText(_translate("diag_search", "Connect"))
self.act_connect.setToolTip(_translate("diag_search", "Connect to Revoluton Pi"))
from . import ressources_rc from . import ressources_rc

8
ui_dev/avahisearch.ui
View File

@@ -151,6 +151,14 @@
<string>You have to configure your Revolution Pi to accept this connections</string> <string>You have to configure your Revolution Pi to accept this connections</string>
</property> </property>
</action> </action>
<action name="act_connect">
<property name="text">
<string>Connect</string>
</property>
<property name="toolTip">
<string>Connect to Revoluton Pi</string>
</property>
</action>
</widget> </widget>
<resources> <resources>
<include location="ressources.qrc"/> <include location="ressources.qrc"/>