diff --git a/res/test_plugin/plugin/__init__.py b/res/test_plugin/plugin/__init__.py
deleted file mode 100644
index 2ed03dffc10489701fe7d86f740a787330d377fd..0000000000000000000000000000000000000000
--- a/res/test_plugin/plugin/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from PyQt5.QtWidgets import QMessageBox
-
-
-def display_messagebox():
- QMessageBox.about(None, "About", "Sakia")
\ No newline at end of file
diff --git a/src/sakia/gui/main_window/toolbar/view.py b/src/sakia/gui/main_window/toolbar/view.py
index 931509628d45bce0dcd26ef0751fb21a53022d2d..769982bf505f226c08cc0f29d0310d24aa855a47 100644
--- a/src/sakia/gui/main_window/toolbar/view.py
+++ b/src/sakia/gui/main_window/toolbar/view.py
@@ -6,7 +6,7 @@ from .toolbar_uic import Ui_SakiaToolbar
from .about_uic import Ui_AboutPopup
from .about_money_uic import Ui_AboutMoney
from .about_wot_uic import Ui_AboutWot
-from sakia.helpers import timestamp_to_dhms
+from sakia.helpers import timestamp_to_dhms, dpi_ratio
class ToolbarView(QFrame, Ui_SakiaToolbar):
@@ -34,23 +34,38 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
self.action_plugins = QAction(self.tr("Plugins manager"), tool_menu)
tool_menu.addAction(self.action_plugins)
- self.action_about_money = QAction(self.tr("About Money"), tool_menu)
- tool_menu.addAction(self.action_about_money)
+ tool_menu.addSeparator()
- self.action_about_referentials = QAction(self.tr("About Referentials"), tool_menu)
- tool_menu.addAction(self.action_about_referentials)
+ about_menu = QMenu(self.tr("About"), tool_menu)
+ tool_menu.addMenu(about_menu)
- self.action_about_wot = QAction(self.tr("About Web of Trust"), tool_menu)
- tool_menu.addAction(self.action_about_wot)
+ self.action_about_money = QAction(self.tr("About Money"), about_menu)
+ about_menu.addAction(self.action_about_money)
- self.action_about = QAction(self.tr("About Sakia"), tool_menu)
- tool_menu.addAction(self.action_about)
+ self.action_about_referentials = QAction(self.tr("About Referentials"), about_menu)
+ about_menu.addAction(self.action_about_referentials)
+
+ self.action_about_wot = QAction(self.tr("About Web of Trust"), about_menu)
+ about_menu.addAction(self.action_about_wot)
+
+ self.action_about = QAction(self.tr("About Sakia"), about_menu)
+ about_menu.addAction(self.action_about)
self.action_exit = QAction(self.tr("Exit"), tool_menu)
tool_menu.addAction(self.action_exit)
self.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Minimum)
self.setMaximumHeight(60)
+ self.button_network.setIconSize(self.button_network.iconSize()*dpi_ratio())
+ self.button_contacts.setIconSize(self.button_contacts.iconSize()*dpi_ratio())
+ self.button_identity.setIconSize(self.button_identity.iconSize()*dpi_ratio())
+ self.button_explore.setIconSize(self.button_explore.iconSize()*dpi_ratio())
+ self.toolbutton_menu.setIconSize(self.toolbutton_menu.iconSize()*dpi_ratio())
+ self.button_network.setFixedHeight(self.button_network.height()*dpi_ratio())
+ self.button_contacts.setFixedHeight(self.button_contacts.height()*dpi_ratio())
+ self.button_identity.setFixedHeight(self.button_identity.height()*dpi_ratio())
+ self.button_explore.setFixedHeight(self.button_explore.height()*dpi_ratio())
+ self.toolbutton_menu.setFixedHeight(self.toolbutton_menu.height()*dpi_ratio())
async def ask_for_connection(self, connections):
connections_titles = [c.title() for c in connections]
diff --git a/src/sakia/gui/sub/certification/certification.ui b/src/sakia/gui/sub/certification/certification.ui
index 46a5719ffc606136ac2e68e9e70c3f516e3008df..0d301aae7d3efc8278c785415bcdc687d9dcd274 100644
--- a/src/sakia/gui/sub/certification/certification.ui
+++ b/src/sakia/gui/sub/certification/certification.ui
@@ -103,6 +103,13 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="button_cancel">
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
@@ -151,6 +158,13 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="button_cancel_licence">
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
diff --git a/src/sakia/gui/sub/certification/controller.py b/src/sakia/gui/sub/certification/controller.py
index 3c08a575cb0a2968854071da0c1da719b8308992..b8fea4ddf21410213bb283ee1195d40c83f2d0f6 100644
--- a/src/sakia/gui/sub/certification/controller.py
+++ b/src/sakia/gui/sub/certification/controller.py
@@ -31,6 +31,8 @@ class CertificationController(QObject):
super().__init__()
self.view.button_box.accepted.connect(self.accept)
self.view.button_box.rejected.connect(self.reject)
+ self.view.button_cancel.clicked.connect(self.reject)
+ self.view.button_cancel_licence.clicked.connect(self.reject)
self.view.combo_connections.currentIndexChanged.connect(self.change_connection)
@classmethod
diff --git a/src/sakia/main.py b/src/sakia/main.py
index 781648d080b0387ee6d69587dc21186fc3e9c99e..c8ca67b9e5e1001e652bd4332bbe34fb4099956a 100755
--- a/src/sakia/main.py
+++ b/src/sakia/main.py
@@ -41,13 +41,13 @@ def async_exception_handler(loop, context):
logging.error('\n'.join(log_lines), exc_info=exc_info)
for line in log_lines:
- for ignored in ("Unclosed", "socket.gaierror"):
+ for ignored in ("Unclosed", "socket.gaierror", "[Errno 110]"):
if ignored in line:
return
if exc_info:
for line in traceback.format_exception(*exc_info):
- for ignored in ("Unclosed", "socket.gaierror"):
+ for ignored in ("Unclosed", "socket.gaierror", "[Errno 110]"):
if ignored in line:
return
exception_message(log_lines, exc_info)
@@ -101,7 +101,8 @@ if __name__ == '__main__':
app.start_coroutines()
try:
if not app.blockchain_service.initialized():
- box = QMessageBox("Initializing Sakia")
+ box = QMessageBox()
+ box.setWindowTitle("Initialization")
box.setText("Connecting to the network...")
wFlags = box.windowFlags();
if Qt.WindowCloseButtonHint == (wFlags & Qt.WindowCloseButtonHint):
diff --git a/tests/functional/test_connection_cfg_dialog.py b/tests/functional/test_connection_cfg_dialog.py
index 316994cf0b09b0fbb486605a194d1a58d05e1cbb..10599d381748e8ab0e917f35ee5f2239976424bb 100644
--- a/tests/functional/test_connection_cfg_dialog.py
+++ b/tests/functional/test_connection_cfg_dialog.py
@@ -15,8 +15,8 @@ def assert_key_parameters_behaviour(connection_config_dialog, user):
assert connection_config_dialog.view.button_next.isEnabled() is False
assert connection_config_dialog.view.button_generate.isEnabled() is False
QTest.keyClicks(connection_config_dialog.view.edit_password, user.password)
- connection_config_dialog.view.button_next.isEnabled() is False
- connection_config_dialog.view.button_generate.isEnabled() is False
+ assert connection_config_dialog.view.button_next.isEnabled() is False
+ assert connection_config_dialog.view.button_generate.isEnabled() is False
QTest.keyClicks(connection_config_dialog.view.edit_password_repeat, user.password + "wrong")
assert connection_config_dialog.view.button_next.isEnabled() is False
assert connection_config_dialog.view.button_generate.isEnabled() is False