diff --git a/src/sakia/gui/dialogs/connection_cfg/controller.py b/src/sakia/gui/dialogs/connection_cfg/controller.py index d5d8f73ff5932c7c6a6051c4f1e413a5cfa116b4..3bc124a0c7e0fc95441b496963ed81904a74be50 100644 --- a/src/sakia/gui/dialogs/connection_cfg/controller.py +++ b/src/sakia/gui/dialogs/connection_cfg/controller.py @@ -130,7 +130,8 @@ class ConnectionConfigController(QObject): self.password_asker = PasswordAskerDialog(self.model.connection) except (DisconnectedError, ClientError, MalformedDocumentError, ValueError, TimeoutError) as e: self._logger.debug(str(e)) - self.view.display_info(self.tr("Could not connect. Check hostname, ip address or port : </br>str(e)")) + self.view.display_info(self.tr("Could not connect. Check hostname, ip address or port : <br/>" + + str(e))) self.step_node = asyncio.Future() self.view.button_connect.setEnabled(True) self.view.button_register.setEnabled(True) diff --git a/src/sakia/gui/dialogs/connection_cfg/model.py b/src/sakia/gui/dialogs/connection_cfg/model.py index 919b49722f971044999220c16b720549ebdedc33..ef1001a8a5d1c9aaa762c3cffca260900a891518 100644 --- a/src/sakia/gui/dialogs/connection_cfg/model.py +++ b/src/sakia/gui/dialogs/connection_cfg/model.py @@ -30,8 +30,13 @@ class ConnectionConfigModel(QObject): self.identities_processor = identities_processor async def create_connection(self, server, port, secured): - self.node_connector = await NodeConnector.from_address(None, secured, server, port, + node_connector = await NodeConnector.from_address(None, secured, server, port, user_parameters=self.app.parameters) + currencies = self.app.db.connections_repo.get_currencies() + if len(currencies) > 0 and node_connector.node.currency != currencies[0]: + raise ValueError("""This node is running for {0} network.<br/> +Current database is storing {1} network.""".format(node_connector.node.currency, currencies[0])) + self.node_connector = node_connector self.connection = Connection(self.node_connector.node.currency, "", "") self.node_connector.node.state = Node.ONLINE diff --git a/src/sakia/gui/dialogs/connection_cfg/view.py b/src/sakia/gui/dialogs/connection_cfg/view.py index a686d01f5c9de28b2be9fc9c9d22b31638b1d934..45824214fcecfea1c04376f6a12f7ccac2e4fe09 100644 --- a/src/sakia/gui/dialogs/connection_cfg/view.py +++ b/src/sakia/gui/dialogs/connection_cfg/view.py @@ -1,5 +1,5 @@ from PyQt5.QtWidgets import QDialog -from PyQt5.QtCore import pyqtSignal +from PyQt5.QtCore import pyqtSignal, Qt from .connection_cfg_uic import Ui_ConnectionConfigurationDialog from duniterpy.key import SigningKey, ScryptParams from math import ceil, log @@ -36,6 +36,7 @@ class ConnectionConfigView(QDialog, Ui_ConnectionConfigurationDialog): self.spin_p.setMaximum(128) self.spin_p.setValue(self.scrypt_params.p) self.spin_p.valueChanged.connect(self.handle_p_change) + self.label_info.setTextFormat(Qt.RichText) def handle_combo_change(self, index): strengths = [ diff --git a/src/sakia/gui/navigation/informations/view.py b/src/sakia/gui/navigation/informations/view.py index 3355d2dc6d9d3aec1f6ff7f070f06ecf4ddcaef6..cc8bae79cc966ba1e3575eab97cdd122d42ba0f2 100644 --- a/src/sakia/gui/navigation/informations/view.py +++ b/src/sakia/gui/navigation/informations/view.py @@ -200,7 +200,6 @@ class InformationsView(QWidget, Ui_InformationsWidget): <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr> <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr> <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr> - <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr> <tr><td align="right"><b>{:2.0%}</b></td><td>{:}</td></tr> </table> """).format( @@ -218,8 +217,6 @@ class InformationsView(QWidget, Ui_InformationsWidget): self.tr('The average time in seconds for writing 1 block (wished time)'), params.dt_diff_eval, self.tr('The number of blocks required to evaluate again PoWMin value'), - params.blocks_rot, - self.tr('The number of previous blocks to check for personalized difficulty'), params.percent_rot, self.tr('The percent of previous issuers to reach for personalized difficulty') )